diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 12:49:38 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 17:21:01 -0700 |
| commit | e6485581febf7aa68836c6c570a1a6f8eca71c81 (patch) | |
| tree | b0c0d43fb23e13d6a749d9705edeb67423a69d9a /vp9/common/vp9_blockd.h | |
| parent | 1efa79d32f290d2daa8cdb7d358232ba95e95a63 (diff) | |
| download | libvpx-e6485581febf7aa68836c6c570a1a6f8eca71c81.tar libvpx-e6485581febf7aa68836c6c570a1a6f8eca71c81.tar.gz libvpx-e6485581febf7aa68836c6c570a1a6f8eca71c81.tar.bz2 libvpx-e6485581febf7aa68836c6c570a1a6f8eca71c81.zip | |
Remove splitmv.
We leave it in rdopt.c as a local define for now - this can be removed
later. In all other places, we remove it, thereby slightly decreasing
the size of some arrays in the bitstream.
Change-Id: Ic2a9beb97a4eda0b086f62c039d994b192f99ca5
Diffstat (limited to 'vp9/common/vp9_blockd.h')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 5f1b122eb..54d19f518 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -82,12 +82,11 @@ typedef enum { NEARMV, ZEROMV, NEWMV, - SPLITMV, MB_MODE_COUNT } MB_PREDICTION_MODE; static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) { - return mode >= NEARESTMV && mode <= SPLITMV; + return mode >= NEARESTMV && mode <= NEWMV; } #define INTRA_MODE_COUNT (TM_PRED + 1) @@ -122,7 +121,7 @@ typedef enum { #define VP9_UV_MODES (TM_PRED + 1) #define VP9_I32X32_MODES (TM_PRED + 1) -#define VP9_MVREFS (1 + SPLITMV - NEARESTMV) +#define VP9_MVREFS (1 + NEWMV - NEARESTMV) #define WHT_UPSCALE_FACTOR 2 @@ -690,7 +689,6 @@ static INLINE void foreach_predicted_block_in_plane( const MACROBLOCKD* const xd, BLOCK_SIZE_TYPE bsize, int plane, foreach_predicted_block_visitor visit, void *arg) { int i, x, y; - const MB_PREDICTION_MODE mode = xd->mode_info_context->mbmi.mode; // block sizes in number of 4x4 blocks log 2 ("*_b") // 4x4=0, 8x8=2, 16x16=4, 32x32=6, 64x64=8 @@ -701,7 +699,8 @@ static INLINE void foreach_predicted_block_in_plane( // size of the predictor to use. int pred_w, pred_h; - if (mode == SPLITMV) { + if (xd->mode_info_context->mbmi.sb_type < BLOCK_SIZE_SB8X8) { + assert(bsize == BLOCK_SIZE_SB8X8); pred_w = 0; pred_h = 0; } else { |