diff options
author | hkuang <hkuang@google.com> | 2013-07-25 11:11:39 -0700 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2013-07-25 12:03:12 -0700 |
commit | 91037db265ecdd914a26e056cf69207b4f50924e (patch) | |
tree | c78c618cf6d0ffb187e2734d524bca19698b3c0d /mips-dspr2 | |
parent | ba164dffc5a6795bce97fae02b51ccf3330e15e4 (diff) | |
download | android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.tar.gz android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.tar.bz2 android_external_libvpx-91037db265ecdd914a26e056cf69207b4f50924e.zip |
Roll latest libvpx into Android.
Make the VP9 decoding 2X faster than the old one.
Checkout is from master branch(hash:242157c756314827ad9244952c7253e8900b9626).
Change-Id: Ibe67b3ee19f82b87df2416826b63a67f7f79b63a
Diffstat (limited to 'mips-dspr2')
-rw-r--r-- | mips-dspr2/libvpx_srcs.txt | 12 | ||||
-rw-r--r-- | mips-dspr2/vp9_rtcd.h | 188 | ||||
-rw-r--r-- | mips-dspr2/vpx_config.h | 1 | ||||
-rw-r--r-- | mips-dspr2/vpx_scale_rtcd.h | 3 |
4 files changed, 169 insertions, 35 deletions
diff --git a/mips-dspr2/libvpx_srcs.txt b/mips-dspr2/libvpx_srcs.txt index e74102e..d756208 100644 --- a/mips-dspr2/libvpx_srcs.txt +++ b/mips-dspr2/libvpx_srcs.txt @@ -66,7 +66,6 @@ vp8/common/treecoder.c vp8/common/treecoder.h vp8/common/variance_c.c vp8/common/variance.h -vp8/common/vp8_asm_com_offsets.c vp8/common/vp8_entropymodedata.h vp8/decoder/dboolhuff.c vp8/decoder/dboolhuff.h @@ -80,7 +79,6 @@ vp8/decoder/onyxd_if.c vp8/decoder/onyxd_int.h vp8/decoder/threading.c vp8/decoder/treereader.h -vp8/decoder/vp8_asm_dec_offsets.c vp8/encoder/bitstream.c vp8/encoder/bitstream.h vp8/encoder/block.h @@ -136,8 +134,9 @@ vp8/vp8dx.mk vp9/common/generic/vp9_systemdependent.c vp9/common/vp9_alloccommon.c vp9/common/vp9_alloccommon.h -vp9/common/vp9_asm_com_offsets.c vp9/common/vp9_blockd.h +vp9/common/vp9_common_data.c +vp9/common/vp9_common_data.h vp9/common/vp9_common.h vp9/common/vp9_convolve.c vp9/common/vp9_convolve.h @@ -161,10 +160,6 @@ vp9/common/vp9_idct.h vp9/common/vp9_loopfilter.c vp9/common/vp9_loopfilter_filters.c vp9/common/vp9_loopfilter.h -vp9/common/vp9_mbpitch.c -vp9/common/vp9_modecont.c -vp9/common/vp9_modecontext.c -vp9/common/vp9_modecont.h vp9/common/vp9_mv.h vp9/common/vp9_mvref_common.c vp9/common/vp9_mvref_common.h @@ -192,7 +187,6 @@ 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_asm_dec_offsets.c vp9/decoder/vp9_dboolhuff.c vp9/decoder/vp9_dboolhuff.h vp9/decoder/vp9_decodemv.c @@ -201,6 +195,8 @@ vp9/decoder/vp9_decodframe.c vp9/decoder/vp9_decodframe.h vp9/decoder/vp9_detokenize.c vp9/decoder/vp9_detokenize.h +vp9/decoder/vp9_dsubexp.c +vp9/decoder/vp9_dsubexp.h vp9/decoder/vp9_idct_blk.c vp9/decoder/vp9_idct_blk.h vp9/decoder/vp9_onyxd.h diff --git a/mips-dspr2/vp9_rtcd.h b/mips-dspr2/vp9_rtcd.h index 2905eae..0752f45 100644 --- a/mips-dspr2/vp9_rtcd.h +++ b/mips-dspr2/vp9_rtcd.h @@ -38,28 +38,161 @@ void vp9_idct_add_c(int16_t *input, uint8_t *dest, int stride, int eob); void vp9_idct_add_32x32_c(int16_t *q, uint8_t *dst, int stride, int eob); #define vp9_idct_add_32x32 vp9_idct_add_32x32_c -void vp9_copy_mem16x16_c(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch); -void vp9_copy_mem16x16_dspr2(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch); -#define vp9_copy_mem16x16 vp9_copy_mem16x16_dspr2 +void vp9_d27_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d27_predictor_4x4 vp9_d27_predictor_4x4_c -void vp9_copy_mem8x8_c(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch); -void vp9_copy_mem8x8_dspr2(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch); -#define vp9_copy_mem8x8 vp9_copy_mem8x8_dspr2 +void vp9_d45_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d45_predictor_4x4 vp9_d45_predictor_4x4_c -void vp9_copy_mem8x4_c(const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch); -#define vp9_copy_mem8x4 vp9_copy_mem8x4_c +void vp9_d63_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d63_predictor_4x4 vp9_d63_predictor_4x4_c -void vp9_build_intra_predictors_c(uint8_t *src, int src_stride, uint8_t *pred, int y_stride, int mode, int bw, int bh, int up_available, int left_available, int right_available); -#define vp9_build_intra_predictors vp9_build_intra_predictors_c +void vp9_h_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_h_predictor_4x4 vp9_h_predictor_4x4_c -void vp9_build_intra_predictors_sby_s_c(struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize); -#define vp9_build_intra_predictors_sby_s vp9_build_intra_predictors_sby_s_c +void vp9_d117_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c -void vp9_build_intra_predictors_sbuv_s_c(struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize); -#define vp9_build_intra_predictors_sbuv_s vp9_build_intra_predictors_sbuv_s_c +void vp9_d135_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c -void vp9_intra4x4_predict_c(struct macroblockd *xd, int block, enum BLOCK_SIZE_TYPE bsize, int b_mode, uint8_t *predictor, int pre_stride); -#define vp9_intra4x4_predict vp9_intra4x4_predict_c +void vp9_d153_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d153_predictor_4x4 vp9_d153_predictor_4x4_c + +void vp9_v_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_v_predictor_4x4 vp9_v_predictor_4x4_c + +void vp9_tm_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_tm_predictor_4x4 vp9_tm_predictor_4x4_c + +void vp9_dc_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_c + +void vp9_dc_top_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c + +void vp9_dc_left_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c + +void vp9_dc_128_predictor_4x4_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c + +void vp9_d27_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d27_predictor_8x8 vp9_d27_predictor_8x8_c + +void vp9_d45_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d45_predictor_8x8 vp9_d45_predictor_8x8_c + +void vp9_d63_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d63_predictor_8x8 vp9_d63_predictor_8x8_c + +void vp9_h_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_h_predictor_8x8 vp9_h_predictor_8x8_c + +void vp9_d117_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c + +void vp9_d135_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c + +void vp9_d153_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d153_predictor_8x8 vp9_d153_predictor_8x8_c + +void vp9_v_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_v_predictor_8x8 vp9_v_predictor_8x8_c + +void vp9_tm_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_tm_predictor_8x8 vp9_tm_predictor_8x8_c + +void vp9_dc_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_predictor_8x8 vp9_dc_predictor_8x8_c + +void vp9_dc_top_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c + +void vp9_dc_left_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c + +void vp9_dc_128_predictor_8x8_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c + +void vp9_d27_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d27_predictor_16x16 vp9_d27_predictor_16x16_c + +void vp9_d45_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d45_predictor_16x16 vp9_d45_predictor_16x16_c + +void vp9_d63_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d63_predictor_16x16 vp9_d63_predictor_16x16_c + +void vp9_h_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_h_predictor_16x16 vp9_h_predictor_16x16_c + +void vp9_d117_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c + +void vp9_d135_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c + +void vp9_d153_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d153_predictor_16x16 vp9_d153_predictor_16x16_c + +void vp9_v_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_v_predictor_16x16 vp9_v_predictor_16x16_c + +void vp9_tm_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_tm_predictor_16x16 vp9_tm_predictor_16x16_c + +void vp9_dc_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_predictor_16x16 vp9_dc_predictor_16x16_c + +void vp9_dc_top_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c + +void vp9_dc_left_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c + +void vp9_dc_128_predictor_16x16_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c + +void vp9_d27_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d27_predictor_32x32 vp9_d27_predictor_32x32_c + +void vp9_d45_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d45_predictor_32x32 vp9_d45_predictor_32x32_c + +void vp9_d63_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d63_predictor_32x32 vp9_d63_predictor_32x32_c + +void vp9_h_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_h_predictor_32x32 vp9_h_predictor_32x32_c + +void vp9_d117_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c + +void vp9_d135_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c + +void vp9_d153_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c + +void vp9_v_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_v_predictor_32x32 vp9_v_predictor_32x32_c + +void vp9_tm_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_c + +void vp9_dc_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_predictor_32x32 vp9_dc_predictor_32x32_c + +void vp9_dc_top_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c + +void vp9_dc_left_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c + +void vp9_dc_128_predictor_32x32_c(uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col); +#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c void vp9_add_constant_residual_8x8_c(const int16_t diff, uint8_t *dest, int stride); #define vp9_add_constant_residual_8x8 vp9_add_constant_residual_8x8_c @@ -79,7 +212,7 @@ void vp9_mbloop_filter_vertical_edge_c(uint8_t *s, int pitch, const uint8_t *bli 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_mb_lpf_horizontal_edge_w_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +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 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); @@ -97,22 +230,28 @@ void vp9_blend_mb_outer_c(uint8_t *y, uint8_t *u, uint8_t *v, int y1, int u1, in 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_convolve8_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_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_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_convolve8_horiz_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_convolve8_vert_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_convolve8_avg_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_convolve8_avg_horiz_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_convolve8_avg_vert_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +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_short_idct4x4_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); @@ -160,9 +299,6 @@ void vp9_short_iht16x16_add_c(int16_t *input, uint8_t *output, int pitch, int tx void vp9_idct4_1d_c(int16_t *input, int16_t *output); #define vp9_idct4_1d vp9_idct4_1d_c -void vp9_dc_only_idct_add_c(int input_dc, uint8_t *pred_ptr, uint8_t *dst_ptr, int pitch, int stride); -#define vp9_dc_only_idct_add vp9_dc_only_idct_add_c - void vp9_short_iwalsh4x4_1_add_c(int16_t *input, uint8_t *dest, int dest_stride); #define vp9_short_iwalsh4x4_1_add vp9_short_iwalsh4x4_1_add_c diff --git a/mips-dspr2/vpx_config.h b/mips-dspr2/vpx_config.h index 0ca4657..13a092d 100644 --- a/mips-dspr2/vpx_config.h +++ b/mips-dspr2/vpx_config.h @@ -87,5 +87,4 @@ #define CONFIG_MULTIPLE_ARF 0 #define CONFIG_NON420 0 #define CONFIG_ALPHA 0 -#define CONFIG_BALANCED_COEFTREE 0 #endif /* VPX_CONFIG_H */ diff --git a/mips-dspr2/vpx_scale_rtcd.h b/mips-dspr2/vpx_scale_rtcd.h index 7af466a..be038f4 100644 --- a/mips-dspr2/vpx_scale_rtcd.h +++ b/mips-dspr2/vpx_scale_rtcd.h @@ -42,6 +42,9 @@ void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_co void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf, int subsampling_x, int subsampling_y); #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); +#define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c + void vpx_scale_rtcd(void); #include "vpx_config.h" |