diff options
Diffstat (limited to 'vp8/common/blockd.h')
| -rw-r--r-- | vp8/common/blockd.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index aa46aa5e3..96345c2bd 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -44,7 +44,7 @@ void vpx_log(const char *format, ...); /* Segment Feature Masks */ #define SEGMENT_DELTADATA 0 #define SEGMENT_ABSDATA 1 -#if CONFIG_NEW_MVREF +#if CONFIG_NEWBESTREFMV || CONFIG_NEW_MVREF #define MAX_MV_REFS 19 #endif @@ -186,14 +186,6 @@ typedef enum { B_MODE_COUNT } B_PREDICTION_MODE; -#if CONFIG_NEW_MVREF -// Segment level features. -typedef enum { - FIRST_REF = 0, - SECOND_REF = 1 -} MV_REF_TYPE; -#endif - #if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM16X16 // convert MB_PREDICTION_MODE to B_PREDICTION_MODE static B_PREDICTION_MODE pred_mode_conv(MB_PREDICTION_MODE mode) { @@ -283,10 +275,8 @@ typedef struct { MV_REFERENCE_FRAME ref_frame, second_ref_frame; TX_SIZE txfm_size; int_mv mv[2]; // for each reference frame used -#if CONFIG_NEWBESTREFMV || CONFIG_NEW_MVREF +#if CONFIG_NEWBESTREFMV int_mv ref_mv, second_ref_mv; -#endif -#if CONFIG_NEW_MVREF int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REFS]; int mv_ref_index[MAX_REF_FRAMES]; #endif @@ -454,11 +444,7 @@ typedef struct MacroBlockD { int mb_index; // Index of the MB in the SB (0..3) #if CONFIG_NEWBESTREFMV -#if CONFIG_NEW_MVREF int_mv ref_mv[MAX_MV_REFS]; -#else - int_mv ref_mv[4]; -#endif #endif #if CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM16X16 |