diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/libvpx_srcs.txt | 111 | ||||
| -rw-r--r-- | generic/vp8_rtcd.h | 343 | ||||
| -rw-r--r-- | generic/vp9_rtcd.h | 718 | ||||
| -rw-r--r-- | generic/vpx_config.c | 2 | ||||
| -rw-r--r-- | generic/vpx_config.h | 6 | ||||
| -rw-r--r-- | generic/vpx_scale_rtcd.h | 43 | ||||
| -rw-r--r-- | generic/vpx_version.h | 8 |
7 files changed, 861 insertions, 370 deletions
diff --git a/generic/libvpx_srcs.txt b/generic/libvpx_srcs.txt index e07d5af..ad610b0 100644 --- a/generic/libvpx_srcs.txt +++ b/generic/libvpx_srcs.txt @@ -1,4 +1,4 @@ -build/make/rtcd.sh +build/make/rtcd.pl build/make/version.sh CHANGELOG libs.mk @@ -48,7 +48,7 @@ vp8/common/reconintra4x4.c vp8/common/reconintra4x4.h vp8/common/reconintra.c vp8/common/rtcd.c -vp8/common/rtcd_defs.sh +vp8/common/rtcd_defs.pl vp8/common/sad_c.c vp8/common/setupintrarecon.c vp8/common/setupintrarecon.h @@ -63,10 +63,10 @@ vp8/common/variance.h vp8/common/vp8_entropymodedata.h vp8/decoder/dboolhuff.c vp8/decoder/dboolhuff.h +vp8/decoder/decodeframe.c vp8/decoder/decodemv.c vp8/decoder/decodemv.h vp8/decoder/decoderthreading.h -vp8/decoder/decodframe.c vp8/decoder/detokenize.c vp8/decoder/detokenize.h vp8/decoder/onyxd_if.c @@ -105,8 +105,6 @@ vp8/encoder/onyx_int.h vp8/encoder/pickinter.c vp8/encoder/pickinter.h vp8/encoder/picklpf.c -vp8/encoder/psnr.c -vp8/encoder/psnr.h vp8/encoder/quantize.c vp8/encoder/quantize.h vp8/encoder/ratectrl.c @@ -125,9 +123,9 @@ vp8/vp8_cx_iface.c vp8/vp8cx.mk vp8/vp8_dx_iface.c vp8/vp8dx.mk -vp9/common/generic/vp9_systemdependent.c vp9/common/vp9_alloccommon.c vp9/common/vp9_alloccommon.h +vp9/common/vp9_blockd.c vp9/common/vp9_blockd.h vp9/common/vp9_common_data.c vp9/common/vp9_common_data.h @@ -135,7 +133,6 @@ vp9/common/vp9_common.h vp9/common/vp9_convolve.c vp9/common/vp9_convolve.h vp9/common/vp9_debugmodes.c -vp9/common/vp9_default_coef_probs.h vp9/common/vp9_entropy.c vp9/common/vp9_entropy.h vp9/common/vp9_entropymode.c @@ -143,12 +140,10 @@ vp9/common/vp9_entropymode.h vp9/common/vp9_entropymv.c vp9/common/vp9_entropymv.h vp9/common/vp9_enums.h -vp9/common/vp9_extend.c -vp9/common/vp9_extend.h vp9/common/vp9_filter.c vp9/common/vp9_filter.h -vp9/common/vp9_findnearmv.c -vp9/common/vp9_findnearmv.h +vp9/common/vp9_frame_buffers.c +vp9/common/vp9_frame_buffers.h vp9/common/vp9_idct.c vp9/common/vp9_idct.h vp9/common/vp9_loopfilter.c @@ -158,11 +153,12 @@ vp9/common/vp9_mv.h vp9/common/vp9_mvref_common.c vp9/common/vp9_mvref_common.h vp9/common/vp9_onyxc_int.h -vp9/common/vp9_onyx.h vp9/common/vp9_ppflags.h vp9/common/vp9_pragmas.h vp9/common/vp9_pred_common.c vp9/common/vp9_pred_common.h +vp9/common/vp9_prob.c +vp9/common/vp9_prob.h vp9/common/vp9_quant_common.c vp9/common/vp9_quant_common.h vp9/common/vp9_reconinter.c @@ -170,8 +166,7 @@ vp9/common/vp9_reconinter.h vp9/common/vp9_reconintra.c vp9/common/vp9_reconintra.h vp9/common/vp9_rtcd.c -vp9/common/vp9_rtcd_defs.sh -vp9/common/vp9_sadmxn.h +vp9/common/vp9_rtcd_defs.pl vp9/common/vp9_scale.c vp9/common/vp9_scale.h vp9/common/vp9_scan.c @@ -182,31 +177,91 @@ vp9/common/vp9_systemdependent.h vp9/common/vp9_textblit.h vp9/common/vp9_tile_common.c vp9/common/vp9_tile_common.h -vp9/common/vp9_treecoder.c -vp9/common/vp9_treecoder.h -vp9/decoder/vp9_dboolhuff.c -vp9/decoder/vp9_dboolhuff.h +vp9/decoder/vp9_decodeframe.c +vp9/decoder/vp9_decodeframe.h vp9/decoder/vp9_decodemv.c vp9/decoder/vp9_decodemv.h -vp9/decoder/vp9_decodframe.c -vp9/decoder/vp9_decodframe.h +vp9/decoder/vp9_decoder.c +vp9/decoder/vp9_decoder.h vp9/decoder/vp9_detokenize.c vp9/decoder/vp9_detokenize.h vp9/decoder/vp9_dsubexp.c vp9/decoder/vp9_dsubexp.h -vp9/decoder/vp9_onyxd.h -vp9/decoder/vp9_onyxd_if.c -vp9/decoder/vp9_onyxd_int.h +vp9/decoder/vp9_dthread.c +vp9/decoder/vp9_dthread.h +vp9/decoder/vp9_read_bit_buffer.c vp9/decoder/vp9_read_bit_buffer.h +vp9/decoder/vp9_reader.c +vp9/decoder/vp9_reader.h vp9/decoder/vp9_thread.c vp9/decoder/vp9_thread.h -vp9/decoder/vp9_treereader.h +vp9/encoder/vp9_bitstream.c +vp9/encoder/vp9_bitstream.h +vp9/encoder/vp9_block.h +vp9/encoder/vp9_cost.c +vp9/encoder/vp9_cost.h +vp9/encoder/vp9_craq.c +vp9/encoder/vp9_craq.h +vp9/encoder/vp9_dct.c +vp9/encoder/vp9_encodeframe.c +vp9/encoder/vp9_encodeframe.h +vp9/encoder/vp9_encodemb.c +vp9/encoder/vp9_encodemb.h +vp9/encoder/vp9_encodemv.c +vp9/encoder/vp9_encodemv.h +vp9/encoder/vp9_extend.c +vp9/encoder/vp9_extend.h +vp9/encoder/vp9_firstpass.c +vp9/encoder/vp9_firstpass.h +vp9/encoder/vp9_lookahead.c +vp9/encoder/vp9_lookahead.h +vp9/encoder/vp9_mbgraph.c +vp9/encoder/vp9_mbgraph.h +vp9/encoder/vp9_mcomp.c +vp9/encoder/vp9_mcomp.h +vp9/encoder/vp9_onyx_if.c +vp9/encoder/vp9_onyx_int.h +vp9/encoder/vp9_picklpf.c +vp9/encoder/vp9_picklpf.h +vp9/encoder/vp9_pickmode.c +vp9/encoder/vp9_pickmode.h +vp9/encoder/vp9_quantize.c +vp9/encoder/vp9_quantize.h +vp9/encoder/vp9_ratectrl.c +vp9/encoder/vp9_ratectrl.h +vp9/encoder/vp9_rdopt.c +vp9/encoder/vp9_rdopt.h +vp9/encoder/vp9_resize.c +vp9/encoder/vp9_resize.h +vp9/encoder/vp9_sad.c +vp9/encoder/vp9_segmentation.c +vp9/encoder/vp9_segmentation.h +vp9/encoder/vp9_subexp.c +vp9/encoder/vp9_subexp.h +vp9/encoder/vp9_svc_layercontext.c +vp9/encoder/vp9_svc_layercontext.h +vp9/encoder/vp9_temporal_filter.c +vp9/encoder/vp9_temporal_filter.h +vp9/encoder/vp9_tokenize.c +vp9/encoder/vp9_tokenize.h +vp9/encoder/vp9_treewriter.c +vp9/encoder/vp9_treewriter.h +vp9/encoder/vp9_vaq.c +vp9/encoder/vp9_vaq.h +vp9/encoder/vp9_variance.c +vp9/encoder/vp9_variance.h +vp9/encoder/vp9_write_bit_buffer.h +vp9/encoder/vp9_writer.c +vp9/encoder/vp9_writer.h vp9/vp9_common.mk +vp9/vp9_cx_iface.c +vp9/vp9cx.mk vp9/vp9_dx_iface.c vp9/vp9dx.mk vp9/vp9_iface_common.h vpx_config.c vpx/internal/vpx_codec_internal.h +vpx/internal/vpx_psnr.h vpx_mem/include/vpx_mem_intrnl.h vpx_mem/vpx_mem.c vpx_mem/vpx_mem.h @@ -214,6 +269,8 @@ vpx_mem/vpx_mem.mk vpx_ports/asm_offsets.h vpx_ports/emmintrin_compat.h vpx_ports/mem.h +vpx_ports/mem_ops_aligned.h +vpx_ports/mem_ops.h vpx_ports/vpx_once.h vpx_ports/vpx_ports.mk vpx_ports/vpx_timer.h @@ -225,12 +282,15 @@ vpx_scale/vpx_scale_asm_offsets.c vpx_scale/vpx_scale.h vpx_scale/vpx_scale.mk vpx_scale/vpx_scale_rtcd.c -vpx_scale/vpx_scale_rtcd.sh +vpx_scale/vpx_scale_rtcd.pl vpx_scale/yv12config.h +vpx/src/svc_encodeframe.c vpx/src/vpx_codec.c vpx/src/vpx_decoder.c vpx/src/vpx_encoder.c vpx/src/vpx_image.c +vpx/src/vpx_psnr.c +vpx/svc_context.h vpx/vp8cx.h vpx/vp8dx.h vpx/vp8.h @@ -238,5 +298,6 @@ vpx/vpx_codec.h vpx/vpx_codec.mk vpx/vpx_decoder.h vpx/vpx_encoder.h +vpx/vpx_frame_buffer.h vpx/vpx_image.h vpx/vpx_integer.h diff --git a/generic/vp8_rtcd.h b/generic/vp8_rtcd.h index 97ef714..9e8dc5f 100644 --- a/generic/vp8_rtcd.h +++ b/generic/vp8_rtcd.h @@ -7,6 +7,10 @@ #define RTCD_EXTERN extern #endif +#ifdef __cplusplus +extern "C" { +#endif + /* * VP8 */ @@ -22,209 +26,188 @@ struct variance_vtable; union int_mv; struct yv12_buffer_config; -void vp8_clear_system_state_c(); -#define vp8_clear_system_state vp8_clear_system_state_c - -void vp8_dequantize_b_c(struct blockd*, short *dqc); -#define vp8_dequantize_b vp8_dequantize_b_c - -void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); -#define vp8_dequant_idct_add vp8_dequant_idct_add_c - -void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs); -#define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c - -void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs); -#define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c - -void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); -#define vp8_loop_filter_mbv vp8_loop_filter_mbv_c - -void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); -#define vp8_loop_filter_bv vp8_loop_filter_bv_c - -void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); -#define vp8_loop_filter_mbh vp8_loop_filter_mbh_c - -void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); -#define vp8_loop_filter_bh vp8_loop_filter_bh_c - -void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit); -#define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c +void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c -void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit); -#define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c +void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c -void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit); -#define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c +void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c -void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit); -#define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c +void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c -void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride); -#define vp8_short_idct4x4llm vp8_short_idct4x4llm_c +int vp8_block_error_c(short *coeff, short *dqcoeff); +#define vp8_block_error vp8_block_error_c -void vp8_short_inv_walsh4x4_1_c(short *input, short *output); -#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c -void vp8_short_inv_walsh4x4_c(short *input, short *output); -#define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c -void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride); -#define vp8_dc_only_idct_add vp8_dc_only_idct_add_c +void vp8_clear_system_state_c(); +#define vp8_clear_system_state vp8_clear_system_state_c void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem16x16 vp8_copy_mem16x16_c +void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); +#define vp8_copy_mem8x4 vp8_copy_mem8x4_c + void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x8 vp8_copy_mem8x8_c -void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -#define vp8_copy_mem8x4 vp8_copy_mem8x4_c +void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride); +#define vp8_dc_only_idct_add vp8_dc_only_idct_add_c -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_c -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride); +#define vp8_dequant_idct_add vp8_dequant_idct_add_c -void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); -#define vp8_intra4x4_predict vp8_intra4x4_predict_c +void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs); +#define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c -void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c +void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs); +#define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c -void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c +void vp8_dequantize_b_c(struct blockd*, short *dqc); +#define vp8_dequantize_b vp8_dequantize_b_c -void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c +int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_diamond_search_sad vp8_diamond_search_sad_c -void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c +void vp8_fast_quantize_b_c(struct block *, struct blockd *); +#define vp8_fast_quantize_b vp8_fast_quantize_b_c -void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c +void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); +#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c -void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c +int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_full_search_sad vp8_full_search_sad_c -void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +#define vp8_get4x4sse_cs vp8_get4x4sse_cs_c -void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c +unsigned int vp8_get_mb_ss_c(const short *); +#define vp8_get_mb_ss vp8_get_mb_ss_c -unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance4x4 vp8_variance4x4_c +void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict vp8_intra4x4_predict_c -unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance8x8 vp8_variance8x8_c +void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); +#define vp8_loop_filter_bh vp8_loop_filter_bh_c -unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance8x16 vp8_variance8x16_c +void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); +#define vp8_loop_filter_bv vp8_loop_filter_bv_c -unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance16x8 vp8_variance16x8_c +void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); +#define vp8_loop_filter_mbh vp8_loop_filter_mbh_c -unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance16x16 vp8_variance16x16_c +void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi); +#define vp8_loop_filter_mbv vp8_loop_filter_mbv_c -unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_variance4x4 vp8_sub_pixel_variance4x4_c +void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit); +#define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c -unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_variance8x8 vp8_sub_pixel_variance8x8_c +void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit); +#define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c -unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_variance8x16 vp8_sub_pixel_variance8x16_c +void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit); +#define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c -unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_variance16x8 vp8_sub_pixel_variance16x8_c +void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit); +#define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c -unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_variance16x16 vp8_sub_pixel_variance16x16_c +int vp8_mbblock_error_c(struct macroblock *mb, int dc); +#define vp8_mbblock_error vp8_mbblock_error_c -unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance_halfpixvar16x16_h vp8_variance_halfpixvar16x16_h_c +int vp8_mbuverror_c(struct macroblock *mb); +#define vp8_mbuverror vp8_mbuverror_c -unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance_halfpixvar16x16_v vp8_variance_halfpixvar16x16_v_c +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_mse16x16 vp8_mse16x16_c -unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_c +void vp8_quantize_mb_c(struct macroblock *); +#define vp8_quantize_mb vp8_quantize_mb_c -unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); -#define vp8_sad4x4 vp8_sad4x4_c +void vp8_quantize_mbuv_c(struct macroblock *); +#define vp8_quantize_mbuv vp8_quantize_mbuv_c -unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); -#define vp8_sad8x8 vp8_sad8x8_c +void vp8_quantize_mby_c(struct macroblock *); +#define vp8_quantize_mby vp8_quantize_mby_c -unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); -#define vp8_sad8x16 vp8_sad8x16_c +int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); +#define vp8_refining_search_sad vp8_refining_search_sad_c -unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); -#define vp8_sad16x8 vp8_sad16x8_c +void vp8_regular_quantize_b_c(struct block *, struct blockd *); +#define vp8_regular_quantize_b vp8_regular_quantize_b_c + +void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); +#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); #define vp8_sad16x16 vp8_sad16x16_c -void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); -#define vp8_sad4x4x3 vp8_sad4x4x3_c +void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp8_sad16x16x3 vp8_sad16x16x3_c -void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); -#define vp8_sad8x8x3 vp8_sad8x8x3_c +void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp8_sad16x16x4d vp8_sad16x16x4d_c -void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); -#define vp8_sad8x16x3 vp8_sad8x16x3_c +void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); +#define vp8_sad16x16x8 vp8_sad16x16x8_c + +unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp8_sad16x8 vp8_sad16x8_c void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); #define vp8_sad16x8x3 vp8_sad16x8x3_c -void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); -#define vp8_sad16x16x3 vp8_sad16x16x3_c - -void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); -#define vp8_sad4x4x8 vp8_sad4x4x8_c - -void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); -#define vp8_sad8x8x8 vp8_sad8x8x8_c - -void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); -#define vp8_sad8x16x8 vp8_sad8x16x8_c +void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp8_sad16x8x4d vp8_sad16x8x4d_c void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); #define vp8_sad16x8x8 vp8_sad16x8x8_c -void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); -#define vp8_sad16x16x8 vp8_sad16x16x8_c +unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp8_sad4x4 vp8_sad4x4_c + +void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp8_sad4x4x3 vp8_sad4x4x3_c void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp8_sad4x4x4d vp8_sad4x4x4d_c -void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); -#define vp8_sad8x8x4d vp8_sad8x8x4d_c +void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); +#define vp8_sad4x4x8 vp8_sad4x4x8_c + +unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp8_sad8x16 vp8_sad8x16_c + +void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp8_sad8x16x3 vp8_sad8x16x3_c void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); #define vp8_sad8x16x4d vp8_sad8x16x4d_c -void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); -#define vp8_sad16x8x4d vp8_sad16x8x4d_c - -void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); -#define vp8_sad16x16x4d vp8_sad16x16x4d_c +void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); +#define vp8_sad8x16x8 vp8_sad8x16x8_c -unsigned int vp8_get_mb_ss_c(const short *); -#define vp8_get_mb_ss vp8_get_mb_ss_c +unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp8_sad8x8 vp8_sad8x8_c -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c +void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp8_sad8x8x3 vp8_sad8x8x3_c -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_mse16x16 vp8_mse16x16_c +void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp8_sad8x8x4d vp8_sad8x8x4d_c -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -#define vp8_get4x4sse_cs vp8_get4x4sse_cs_c +void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned short *sad_array); +#define vp8_sad8x8x8 vp8_sad8x8x8_c void vp8_short_fdct4x4_c(short *input, short *output, int pitch); #define vp8_short_fdct4x4 vp8_short_fdct4x4_c @@ -232,70 +215,96 @@ void vp8_short_fdct4x4_c(short *input, short *output, int pitch); void vp8_short_fdct8x4_c(short *input, short *output, int pitch); #define vp8_short_fdct8x4 vp8_short_fdct8x4_c +void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride); +#define vp8_short_idct4x4llm vp8_short_idct4x4llm_c + +void vp8_short_inv_walsh4x4_c(short *input, short *output); +#define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c + +void vp8_short_inv_walsh4x4_1_c(short *input, short *output); +#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c + void vp8_short_walsh4x4_c(short *input, short *output, int pitch); #define vp8_short_walsh4x4 vp8_short_walsh4x4_c -void vp8_regular_quantize_b_c(struct block *, struct blockd *); -#define vp8_regular_quantize_b vp8_regular_quantize_b_c +void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c -void vp8_fast_quantize_b_c(struct block *, struct blockd *); -#define vp8_fast_quantize_b vp8_fast_quantize_b_c +void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c -void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); -#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c +void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c -void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2); -#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c +void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); +#define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c -void vp8_quantize_mb_c(struct macroblock *); -#define vp8_quantize_mb vp8_quantize_mb_c +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c -void vp8_quantize_mby_c(struct macroblock *); -#define vp8_quantize_mby vp8_quantize_mby_c +unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_variance16x16 vp8_sub_pixel_variance16x16_c -void vp8_quantize_mbuv_c(struct macroblock *); -#define vp8_quantize_mbuv vp8_quantize_mbuv_c +unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_variance16x8 vp8_sub_pixel_variance16x8_c -int vp8_block_error_c(short *coeff, short *dqcoeff); -#define vp8_block_error vp8_block_error_c +unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_variance4x4 vp8_sub_pixel_variance4x4_c -int vp8_mbblock_error_c(struct macroblock *mb, int dc); -#define vp8_mbblock_error vp8_mbblock_error_c +unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_variance8x16 vp8_sub_pixel_variance8x16_c -int vp8_mbuverror_c(struct macroblock *mb); -#define vp8_mbuverror vp8_mbuverror_c +unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_variance8x8 vp8_sub_pixel_variance8x8_c void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch); #define vp8_subtract_b vp8_subtract_b_c +void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride); +#define vp8_subtract_mbuv vp8_subtract_mbuv_c + void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride); #define vp8_subtract_mby vp8_subtract_mby_c -void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride); -#define vp8_subtract_mbuv vp8_subtract_mbuv_c +unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance16x16 vp8_variance16x16_c -int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -#define vp8_full_search_sad vp8_full_search_sad_c +unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance16x8 vp8_variance16x8_c -int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -#define vp8_refining_search_sad vp8_refining_search_sad_c +unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance4x4 vp8_variance4x4_c -int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv); -#define vp8_diamond_search_sad vp8_diamond_search_sad_c +unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance8x16 vp8_variance8x16_c + +unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance8x8 vp8_variance8x8_c + +unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance_halfpixvar16x16_h vp8_variance_halfpixvar16x16_h_c + +unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_c + +unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_variance_halfpixvar16x16_v vp8_variance_halfpixvar16x16_v_c void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c -int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); -#define vp8_denoiser_filter vp8_denoiser_filter_c - void vp8_rtcd(void); + #include "vpx_config.h" #ifdef RTCD_C static void setup_rtcd_internal(void) { - } #endif + +#ifdef __cplusplus +} // extern "C" +#endif + #endif diff --git a/generic/vp9_rtcd.h b/generic/vp9_rtcd.h index d9e1b0b..a11bb00 100644 --- a/generic/vp9_rtcd.h +++ b/generic/vp9_rtcd.h @@ -7,6 +7,10 @@ #define RTCD_EXTERN extern #endif +#ifdef __cplusplus +extern "C" { +#endif + /* * VP9 */ @@ -21,230 +25,222 @@ struct macroblock; struct vp9_variance_vtable; #define DEC_MVCOSTS int *mvjcost, int *mvcost[2] +struct mv; union int_mv; struct yv12_buffer_config; -void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d207_predictor_4x4 vp9_d207_predictor_4x4_c - -void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d45_predictor_4x4 vp9_d45_predictor_4x4_c - -void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d63_predictor_4x4 vp9_d63_predictor_4x4_c +void vp9_blend_b_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); +#define vp9_blend_b vp9_blend_b_c -void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_h_predictor_4x4 vp9_h_predictor_4x4_c +void vp9_blend_mb_inner_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); +#define vp9_blend_mb_inner vp9_blend_mb_inner_c -void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c +void vp9_blend_mb_outer_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); +#define vp9_blend_mb_outer vp9_blend_mb_outer_c -void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c +int64_t vp9_block_error_c(const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size, int64_t *ssz); +#define vp9_block_error vp9_block_error_c -void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d153_predictor_4x4 vp9_d153_predictor_4x4_c +void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8 vp9_convolve8_c -void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_v_predictor_4x4 vp9_v_predictor_4x4_c +void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8_avg vp9_convolve8_avg_c -void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_tm_predictor_4x4 vp9_tm_predictor_4x4_c +void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8_avg_horiz vp9_convolve8_avg_horiz_c -void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_c +void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8_avg_vert vp9_convolve8_avg_vert_c -void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c +void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8_horiz vp9_convolve8_horiz_c -void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c +void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve8_vert vp9_convolve8_vert_c -void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c +void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve_avg vp9_convolve_avg_c -void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d207_predictor_8x8 vp9_d207_predictor_8x8_c +void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define vp9_convolve_copy vp9_convolve_copy_c -void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d45_predictor_8x8 vp9_d45_predictor_8x8_c +void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c -void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d63_predictor_8x8 vp9_d63_predictor_8x8_c +void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c -void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_h_predictor_8x8 vp9_h_predictor_8x8_c +void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c void vp9_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c -void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c +void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c -void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d153_predictor_8x8 vp9_d153_predictor_8x8_c +void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c -void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_v_predictor_8x8 vp9_v_predictor_8x8_c +void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c -void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_tm_predictor_8x8 vp9_tm_predictor_8x8_c +void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c -void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_predictor_8x8 vp9_dc_predictor_8x8_c +void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d153_predictor_16x16 vp9_d153_predictor_16x16_c -void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c +void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c -void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c +void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d153_predictor_4x4 vp9_d153_predictor_4x4_c -void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c +void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d153_predictor_8x8 vp9_d153_predictor_8x8_c void vp9_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_d207_predictor_16x16 vp9_d207_predictor_16x16_c -void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d45_predictor_16x16 vp9_d45_predictor_16x16_c +void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d207_predictor_32x32 vp9_d207_predictor_32x32_c -void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d63_predictor_16x16 vp9_d63_predictor_16x16_c +void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d207_predictor_4x4 vp9_d207_predictor_4x4_c -void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_h_predictor_16x16 vp9_h_predictor_16x16_c +void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d207_predictor_8x8 vp9_d207_predictor_8x8_c -void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c +void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d45_predictor_16x16 vp9_d45_predictor_16x16_c -void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c +void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d45_predictor_32x32 vp9_d45_predictor_32x32_c -void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d153_predictor_16x16 vp9_d153_predictor_16x16_c +void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d45_predictor_4x4 vp9_d45_predictor_4x4_c -void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_v_predictor_16x16 vp9_v_predictor_16x16_c +void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d45_predictor_8x8 vp9_d45_predictor_8x8_c -void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_tm_predictor_16x16 vp9_tm_predictor_16x16_c +void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d63_predictor_16x16 vp9_d63_predictor_16x16_c -void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_predictor_16x16 vp9_dc_predictor_16x16_c +void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d63_predictor_32x32 vp9_d63_predictor_32x32_c -void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c +void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d63_predictor_4x4 vp9_d63_predictor_4x4_c -void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c +void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_d63_predictor_8x8 vp9_d63_predictor_8x8_c void vp9_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c -void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d207_predictor_32x32 vp9_d207_predictor_32x32_c - -void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d45_predictor_32x32 vp9_d45_predictor_32x32_c +void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c -void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d63_predictor_32x32 vp9_d63_predictor_32x32_c +void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c -void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_h_predictor_32x32 vp9_h_predictor_32x32_c +void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c -void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c +void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c -void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c +void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c -void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c +void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c -void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_v_predictor_32x32 vp9_v_predictor_32x32_c +void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c -void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_c +void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_predictor_16x16 vp9_dc_predictor_16x16_c void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define vp9_dc_predictor_32x32 vp9_dc_predictor_32x32_c -void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c +void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_c -void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c +void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_predictor_8x8 vp9_dc_predictor_8x8_c -void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); -#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c +void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c -void vp9_mb_lpf_vertical_edge_w_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -#define vp9_mb_lpf_vertical_edge_w vp9_mb_lpf_vertical_edge_w_c +void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c -void vp9_mbloop_filter_vertical_edge_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); -#define vp9_mbloop_filter_vertical_edge vp9_mbloop_filter_vertical_edge_c +void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c -void vp9_loop_filter_vertical_edge_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); -#define vp9_loop_filter_vertical_edge vp9_loop_filter_vertical_edge_c +void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c -void vp9_mb_lpf_horizontal_edge_w_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); -#define vp9_mb_lpf_horizontal_edge_w vp9_mb_lpf_horizontal_edge_w_c +int vp9_diamond_search_sad_c(const struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +#define vp9_diamond_search_sad vp9_diamond_search_sad_c -void vp9_mbloop_filter_horizontal_edge_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); -#define vp9_mbloop_filter_horizontal_edge vp9_mbloop_filter_horizontal_edge_c +void vp9_fdct16x16_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct16x16 vp9_fdct16x16_c -void vp9_loop_filter_horizontal_edge_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); -#define vp9_loop_filter_horizontal_edge vp9_loop_filter_horizontal_edge_c +void vp9_fdct32x32_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct32x32 vp9_fdct32x32_c -void vp9_blend_mb_inner_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); -#define vp9_blend_mb_inner vp9_blend_mb_inner_c +void vp9_fdct32x32_rd_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct32x32_rd vp9_fdct32x32_rd_c -void vp9_blend_mb_outer_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); -#define vp9_blend_mb_outer vp9_blend_mb_outer_c +void vp9_fdct4x4_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct4x4 vp9_fdct4x4_c -void vp9_blend_b_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, int v1, int alpha, int stride); -#define vp9_blend_b vp9_blend_b_c +void vp9_fdct8x8_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fdct8x8 vp9_fdct8x8_c -void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve_copy vp9_convolve_copy_c +void vp9_fht16x16_c(const int16_t *input, int16_t *output, int stride, int tx_type); +#define vp9_fht16x16 vp9_fht16x16_c -void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve_avg vp9_convolve_avg_c +void vp9_fht4x4_c(const int16_t *input, int16_t *output, int stride, int tx_type); +#define vp9_fht4x4 vp9_fht4x4_c -void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8 vp9_convolve8_c +void vp9_fht8x8_c(const int16_t *input, int16_t *output, int stride, int tx_type); +#define vp9_fht8x8 vp9_fht8x8_c -void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8_horiz vp9_convolve8_horiz_c +int vp9_full_range_search_c(const struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +#define vp9_full_range_search vp9_full_range_search_c -void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8_vert vp9_convolve8_vert_c +int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv, struct mv *best_mv); +#define vp9_full_search_sad vp9_full_search_sad_c -void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8_avg vp9_convolve8_avg_c +void vp9_fwht4x4_c(const int16_t *input, int16_t *output, int stride); +#define vp9_fwht4x4 vp9_fwht4x4_c -void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8_avg_horiz vp9_convolve8_avg_horiz_c +unsigned int vp9_get_mb_ss_c(const int16_t *); +#define vp9_get_mb_ss vp9_get_mb_ss_c -void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); -#define vp9_convolve8_avg_vert vp9_convolve8_avg_vert_c +void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); +#define vp9_get_sse_sum_8x8 vp9_get_sse_sum_8x8_c -void vp9_idct4x4_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct4x4_1_add vp9_idct4x4_1_add_c +void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_h_predictor_16x16 vp9_h_predictor_16x16_c -void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct4x4_16_add vp9_idct4x4_16_add_c +void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_h_predictor_32x32 vp9_h_predictor_32x32_c -void vp9_idct8x8_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct8x8_1_add vp9_idct8x8_1_add_c +void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_h_predictor_4x4 vp9_h_predictor_4x4_c -void vp9_idct8x8_64_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct8x8_64_add vp9_idct8x8_64_add_c +void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_h_predictor_8x8 vp9_h_predictor_8x8_c -void vp9_idct8x8_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct8x8_10_add vp9_idct8x8_10_add_c +void vp9_idct16x16_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct16x16_10_add vp9_idct16x16_10_add_c void vp9_idct16x16_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); #define vp9_idct16x16_1_add vp9_idct16x16_1_add_c @@ -252,17 +248,32 @@ void vp9_idct16x16_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride) void vp9_idct16x16_256_add_c(const int16_t *input, uint8_t *dest, int dest_stride); #define vp9_idct16x16_256_add vp9_idct16x16_256_add_c -void vp9_idct16x16_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct16x16_10_add vp9_idct16x16_10_add_c - void vp9_idct32x32_1024_add_c(const int16_t *input, uint8_t *dest, int dest_stride); #define vp9_idct32x32_1024_add vp9_idct32x32_1024_add_c +void vp9_idct32x32_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct32x32_1_add vp9_idct32x32_1_add_c + void vp9_idct32x32_34_add_c(const int16_t *input, uint8_t *dest, int dest_stride); #define vp9_idct32x32_34_add vp9_idct32x32_34_add_c -void vp9_idct32x32_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_idct32x32_1_add vp9_idct32x32_1_add_c +void vp9_idct4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct4x4_16_add vp9_idct4x4_16_add_c + +void vp9_idct4x4_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct4x4_1_add vp9_idct4x4_1_add_c + +void vp9_idct8x8_10_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_10_add vp9_idct8x8_10_add_c + +void vp9_idct8x8_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_1_add vp9_idct8x8_1_add_c + +void vp9_idct8x8_64_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_idct8x8_64_add vp9_idct8x8_64_add_c + +void vp9_iht16x16_256_add_c(const int16_t *input, uint8_t *output, int pitch, int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c void vp9_iht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride, int tx_type); #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c @@ -270,22 +281,423 @@ void vp9_iht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride, i void vp9_iht8x8_64_add_c(const int16_t *input, uint8_t *dest, int dest_stride, int tx_type); #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c -void vp9_iht16x16_256_add_c(const int16_t *input, uint8_t *output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iwht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); +#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c void vp9_iwht4x4_1_add_c(const int16_t *input, uint8_t *dest, int dest_stride); #define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c -void vp9_iwht4x4_16_add_c(const int16_t *input, uint8_t *dest, int dest_stride); -#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c +void vp9_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); +#define vp9_lpf_horizontal_16 vp9_lpf_horizontal_16_c + +void vp9_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); +#define vp9_lpf_horizontal_4 vp9_lpf_horizontal_4_c + +void vp9_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define vp9_lpf_horizontal_4_dual vp9_lpf_horizontal_4_dual_c + +void vp9_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); +#define vp9_lpf_horizontal_8 vp9_lpf_horizontal_8_c + +void vp9_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define vp9_lpf_horizontal_8_dual vp9_lpf_horizontal_8_dual_c + +void vp9_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define vp9_lpf_vertical_16 vp9_lpf_vertical_16_c + +void vp9_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define vp9_lpf_vertical_16_dual vp9_lpf_vertical_16_dual_c + +void vp9_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); +#define vp9_lpf_vertical_4 vp9_lpf_vertical_4_c + +void vp9_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define vp9_lpf_vertical_4_dual vp9_lpf_vertical_4_dual_c + +void vp9_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count); +#define vp9_lpf_vertical_8 vp9_lpf_vertical_8_c + +void vp9_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define vp9_lpf_vertical_8_dual vp9_lpf_vertical_8_dual_c + +unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse); +#define vp9_mse16x16 vp9_mse16x16_c + +unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse); +#define vp9_mse16x8 vp9_mse16x8_c + +unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse); +#define vp9_mse8x16 vp9_mse8x16_c + +unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int recon_stride, unsigned int *sse); +#define vp9_mse8x8 vp9_mse8x8_c + +void vp9_quantize_b_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); +#define vp9_quantize_b vp9_quantize_b_c + +void vp9_quantize_b_32x32_c(const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); +#define vp9_quantize_b_32x32 vp9_quantize_b_32x32_c + +int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv); +#define vp9_refining_search_sad vp9_refining_search_sad_c + +unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad16x16 vp9_sad16x16_c + +unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad16x16_avg vp9_sad16x16_avg_c + +void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad16x16x3 vp9_sad16x16x3_c + +void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad16x16x4d vp9_sad16x16x4d_c + +void vp9_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad16x16x8 vp9_sad16x16x8_c + +unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad16x32 vp9_sad16x32_c + +unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad16x32_avg vp9_sad16x32_avg_c + +void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad16x32x4d vp9_sad16x32x4d_c + +unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad16x8 vp9_sad16x8_c + +unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad16x8_avg vp9_sad16x8_avg_c + +void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad16x8x3 vp9_sad16x8x3_c + +void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad16x8x4d vp9_sad16x8x4d_c + +void vp9_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad16x8x8 vp9_sad16x8x8_c + +unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad32x16 vp9_sad32x16_c + +unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad32x16_avg vp9_sad32x16_avg_c + +void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad32x16x4d vp9_sad32x16x4d_c + +unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad32x32 vp9_sad32x32_c + +unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad32x32_avg vp9_sad32x32_avg_c + +void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad32x32x3 vp9_sad32x32x3_c + +void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad32x32x4d vp9_sad32x32x4d_c + +void vp9_sad32x32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad32x32x8 vp9_sad32x32x8_c + +unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad32x64 vp9_sad32x64_c + +unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad32x64_avg vp9_sad32x64_avg_c + +void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad32x64x4d vp9_sad32x64x4d_c + +unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad4x4 vp9_sad4x4_c + +unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad4x4_avg vp9_sad4x4_avg_c + +void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad4x4x3 vp9_sad4x4x3_c + +void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad4x4x4d vp9_sad4x4x4d_c + +void vp9_sad4x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad4x4x8 vp9_sad4x4x8_c + +unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad4x8 vp9_sad4x8_c + +unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad4x8_avg vp9_sad4x8_avg_c + +void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad4x8x4d vp9_sad4x8x4d_c + +void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad4x8x8 vp9_sad4x8x8_c + +unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad64x32 vp9_sad64x32_c + +unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad64x32_avg vp9_sad64x32_avg_c + +void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad64x32x4d vp9_sad64x32x4d_c + +unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad64x64 vp9_sad64x64_c + +unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad64x64_avg vp9_sad64x64_avg_c + +void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad64x64x3 vp9_sad64x64x3_c + +void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad64x64x4d vp9_sad64x64x4d_c + +void vp9_sad64x64x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad64x64x8 vp9_sad64x64x8_c + +unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad8x16 vp9_sad8x16_c + +unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad8x16_avg vp9_sad8x16_avg_c + +void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad8x16x3 vp9_sad8x16x3_c + +void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad8x16x4d vp9_sad8x16x4d_c + +void vp9_sad8x16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad8x16x8 vp9_sad8x16x8_c + +unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad8x4 vp9_sad8x4_c + +unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad8x4_avg vp9_sad8x4_avg_c + +void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad8x4x4d vp9_sad8x4x4d_c + +void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad8x4x8 vp9_sad8x4x8_c + +unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int max_sad); +#define vp9_sad8x8 vp9_sad8x8_c + +unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, unsigned int max_sad); +#define vp9_sad8x8_avg vp9_sad8x8_avg_c + +void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sad_array); +#define vp9_sad8x8x3 vp9_sad8x8x3_c + +void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array); +#define vp9_sad8x8x4d vp9_sad8x8x4d_c + +void vp9_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); +#define vp9_sad8x8x8 vp9_sad8x8x8_c + +unsigned int vp9_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance16x16 vp9_sub_pixel_avg_variance16x16_c + +unsigned int vp9_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance16x32 vp9_sub_pixel_avg_variance16x32_c + +unsigned int vp9_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance16x8 vp9_sub_pixel_avg_variance16x8_c + +unsigned int vp9_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance32x16 vp9_sub_pixel_avg_variance32x16_c + +unsigned int vp9_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance32x32 vp9_sub_pixel_avg_variance32x32_c + +unsigned int vp9_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance32x64 vp9_sub_pixel_avg_variance32x64_c + +unsigned int vp9_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance4x4 vp9_sub_pixel_avg_variance4x4_c + +unsigned int vp9_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance4x8 vp9_sub_pixel_avg_variance4x8_c + +unsigned int vp9_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance64x32 vp9_sub_pixel_avg_variance64x32_c + +unsigned int vp9_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance64x64 vp9_sub_pixel_avg_variance64x64_c + +unsigned int vp9_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance8x16 vp9_sub_pixel_avg_variance8x16_c + +unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance8x4 vp9_sub_pixel_avg_variance8x4_c + +unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred); +#define vp9_sub_pixel_avg_variance8x8 vp9_sub_pixel_avg_variance8x8_c + +unsigned int vp9_sub_pixel_mse32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_mse32x32 vp9_sub_pixel_mse32x32_c + +unsigned int vp9_sub_pixel_mse64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_mse64x64 vp9_sub_pixel_mse64x64_c + +unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance16x16 vp9_sub_pixel_variance16x16_c + +unsigned int vp9_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance16x32 vp9_sub_pixel_variance16x32_c + +unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance16x8 vp9_sub_pixel_variance16x8_c + +unsigned int vp9_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance32x16 vp9_sub_pixel_variance32x16_c + +unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance32x32 vp9_sub_pixel_variance32x32_c + +unsigned int vp9_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance32x64 vp9_sub_pixel_variance32x64_c + +unsigned int vp9_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance4x4 vp9_sub_pixel_variance4x4_c + +unsigned int vp9_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance4x8 vp9_sub_pixel_variance4x8_c + +unsigned int vp9_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance64x32 vp9_sub_pixel_variance64x32_c + +unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance64x64 vp9_sub_pixel_variance64x64_c + +unsigned int vp9_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance8x16 vp9_sub_pixel_variance8x16_c + +unsigned int vp9_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance8x4 vp9_sub_pixel_variance8x4_c + +unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_sub_pixel_variance8x8 vp9_sub_pixel_variance8x8_c + +void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); +#define vp9_subtract_block vp9_subtract_block_c + +void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count); +#define vp9_temporal_filter_apply vp9_temporal_filter_apply_c + +void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_tm_predictor_16x16 vp9_tm_predictor_16x16_c + +void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_c + +void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_tm_predictor_4x4 vp9_tm_predictor_4x4_c + +void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_tm_predictor_8x8 vp9_tm_predictor_8x8_c + +void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_v_predictor_16x16 vp9_v_predictor_16x16_c + +void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_v_predictor_32x32 vp9_v_predictor_32x32_c + +void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_v_predictor_4x4 vp9_v_predictor_4x4_c + +void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define vp9_v_predictor_8x8 vp9_v_predictor_8x8_c + +unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance16x16 vp9_variance16x16_c + +unsigned int vp9_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance16x32 vp9_variance16x32_c + +unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance16x8 vp9_variance16x8_c + +unsigned int vp9_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance32x16 vp9_variance32x16_c + +unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance32x32 vp9_variance32x32_c + +unsigned int vp9_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance32x64 vp9_variance32x64_c + +unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance4x4 vp9_variance4x4_c + +unsigned int vp9_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance4x8 vp9_variance4x8_c + +unsigned int vp9_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance64x32 vp9_variance64x32_c + +unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance64x64 vp9_variance64x64_c + +unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance8x16 vp9_variance8x16_c + +unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance8x4 vp9_variance8x4_c + +unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance8x8 vp9_variance8x8_c + +unsigned int vp9_variance_halfpixvar16x16_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar16x16_h vp9_variance_halfpixvar16x16_h_c + +unsigned int vp9_variance_halfpixvar16x16_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar16x16_hv vp9_variance_halfpixvar16x16_hv_c + +unsigned int vp9_variance_halfpixvar16x16_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar16x16_v vp9_variance_halfpixvar16x16_v_c + +unsigned int vp9_variance_halfpixvar32x32_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar32x32_h vp9_variance_halfpixvar32x32_h_c + +unsigned int vp9_variance_halfpixvar32x32_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar32x32_hv vp9_variance_halfpixvar32x32_hv_c + +unsigned int vp9_variance_halfpixvar32x32_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar32x32_v vp9_variance_halfpixvar32x32_v_c + +unsigned int vp9_variance_halfpixvar64x64_h_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar64x64_h vp9_variance_halfpixvar64x64_h_c + +unsigned int vp9_variance_halfpixvar64x64_hv_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar64x64_hv vp9_variance_halfpixvar64x64_hv_c + +unsigned int vp9_variance_halfpixvar64x64_v_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse); +#define vp9_variance_halfpixvar64x64_v vp9_variance_halfpixvar64x64_v_c void vp9_rtcd(void); + #include "vpx_config.h" #ifdef RTCD_C static void setup_rtcd_internal(void) { - } #endif + +#ifdef __cplusplus +} // extern "C" +#endif + #endif diff --git a/generic/vpx_config.c b/generic/vpx_config.c index c87cb91..61f4fd8 100644 --- a/generic/vpx_config.c +++ b/generic/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--force-target=generic-gnu --disable-vp9-encoder --disable-examples --disable-docs --enable-realtime-only"; +static const char* const cfg = "--force-target=generic-gnu --disable-examples --disable-docs --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/generic/vpx_config.h b/generic/vpx_config.h index 5bcd08f..deac830 100644 --- a/generic/vpx_config.h +++ b/generic/vpx_config.h @@ -56,7 +56,6 @@ #define CONFIG_MEM_MANAGER 0 #define CONFIG_MEM_TRACKER 0 #define CONFIG_MEM_CHECKS 0 -#define CONFIG_MD5 1 #define CONFIG_DEQUANT_TOKENS 0 #define CONFIG_DC_RECON 0 #define CONFIG_RUNTIME_CPU_DETECT 0 @@ -66,7 +65,7 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_VP8_ENCODER 1 #define CONFIG_VP8_DECODER 1 -#define CONFIG_VP9_ENCODER 0 +#define CONFIG_VP9_ENCODER 1 #define CONFIG_VP9_DECODER 1 #define CONFIG_VP8 1 #define CONFIG_VP9 1 @@ -83,11 +82,12 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 1 +#define CONFIG_WEBM_IO 1 +#define CONFIG_DECODE_PERF_TESTS 0 #define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #define CONFIG_EXPERIMENTAL 0 #define CONFIG_DECRYPT 0 #define CONFIG_MULTIPLE_ARF 0 -#define CONFIG_NON420 0 #define CONFIG_ALPHA 0 #endif /* VPX_CONFIG_H */ diff --git a/generic/vpx_scale_rtcd.h b/generic/vpx_scale_rtcd.h index 472a290..f5e6caa 100644 --- a/generic/vpx_scale_rtcd.h +++ b/generic/vpx_scale_rtcd.h @@ -7,22 +7,20 @@ #define RTCD_EXTERN extern #endif -struct yv12_buffer_config; +#ifdef __cplusplus +extern "C" { +#endif -void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); -#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c +struct yv12_buffer_config; -void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); -#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); #define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c -void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); -#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c - -void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); -#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c @@ -30,28 +28,39 @@ void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); #define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c -void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); -#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_frame vp8_yv12_copy_frame_c -void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); -#define vpx_yv12_copy_y vpx_yv12_copy_y_c +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c -void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y); +void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf); #define vp9_extend_frame_borders vp9_extend_frame_borders_c -void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y); +void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf); #define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c +void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vpx_yv12_copy_y vpx_yv12_copy_y_c + void vpx_scale_rtcd(void); + #include "vpx_config.h" #ifdef RTCD_C static void setup_rtcd_internal(void) { - } #endif + +#ifdef __cplusplus +} // extern "C" +#endif + #endif diff --git a/generic/vpx_version.h b/generic/vpx_version.h index 9a354bb..0330656 100644 --- a/generic/vpx_version.h +++ b/generic/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 -#define VERSION_MINOR 2 +#define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_EXTRA "5082-g58f7543" +#define VERSION_EXTRA "1928-g8e9c9f1" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.2.0-5082-g58f7543" -#define VERSION_STRING " v1.2.0-5082-g58f7543" +#define VERSION_STRING_NOSP "v1.3.0-1928-g8e9c9f1" +#define VERSION_STRING " v1.3.0-1928-g8e9c9f1" |