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_reconinter.c | |
| 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_reconinter.c')
| -rw-r--r-- | vp9/common/vp9_reconinter.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index cd0ba8445..2bc9c10a2 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -392,8 +392,10 @@ static void build_inter_predictors(int plane, int block, assert(x < bw); assert(y < bh); - assert(xd->mode_info_context->mbmi.mode == SPLITMV || 4 << pred_w == bw); - assert(xd->mode_info_context->mbmi.mode == SPLITMV || 4 << pred_h == bh); + assert(xd->mode_info_context->mbmi.sb_type < BLOCK_SIZE_SB8X8 || + 4 << pred_w == bw); + assert(xd->mode_info_context->mbmi.sb_type < BLOCK_SIZE_SB8X8 || + 4 << pred_h == bh); for (which_mv = 0; which_mv < 1 + use_second_ref; ++which_mv) { // source @@ -412,7 +414,7 @@ static void build_inter_predictors(int plane, int block, MV split_chroma_mv; int_mv clamped_mv; - if (xd->mode_info_context->mbmi.mode == SPLITMV) { + if (xd->mode_info_context->mbmi.sb_type < BLOCK_SIZE_SB8X8) { if (plane == 0) { mv = &xd->mode_info_context->bmi[block].as_mv[which_mv].as_mv; } else { |