diff options
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/variance.h | 15 |
3 files changed, 16 insertions, 3 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index bcbc85766..d7a9456d1 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -707,14 +707,12 @@ void vp8_set_speed_features(VP8_COMP *cpi) { sf->thresh_mult[THR_V_PRED ] = 1000; sf->thresh_mult[THR_H_PRED ] = 1000; -#if CONFIG_NEWINTRAMODES sf->thresh_mult[THR_D45_PRED ] = 1000; sf->thresh_mult[THR_D135_PRED] = 1000; sf->thresh_mult[THR_D117_PRED] = 1000; sf->thresh_mult[THR_D153_PRED] = 1000; sf->thresh_mult[THR_D27_PRED ] = 1000; sf->thresh_mult[THR_D63_PRED ] = 1000; -#endif sf->thresh_mult[THR_B_PRED ] = 2000; sf->thresh_mult[THR_I8X8_PRED] = 2000; sf->thresh_mult[THR_TM ] = 1000; diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index a2c1a230c..ed5b5c96d 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2699,7 +2699,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int int best_filter_state; #endif #if CONFIG_NEWBESTREFMV - int_mv ref_mv[MAX_REF_FRAMES] = {0}; + int_mv ref_mv[MAX_REF_FRAMES] = {{0}}; #endif #if CONFIG_SWITCHABLE_INTERP diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index 73a0a6b99..da83d1261 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -422,4 +422,19 @@ typedef struct { #define SSIMPF_INVOKE(ctx,fn) vp8_ssimpf_##fn #endif +#if CONFIG_NEWBESTREFMV +unsigned int vp8_sad2x16_c( + const unsigned char *src_ptr, + int src_stride, + const unsigned char *ref_ptr, + int ref_stride, + int max_sad); +unsigned int vp8_sad16x2_c( + const unsigned char *src_ptr, + int src_stride, + const unsigned char *ref_ptr, + int ref_stride, + int max_sad); +#endif + #endif |