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/encoder/vp9_encodeframe.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/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index e67c0fed0..5c05760cd 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -332,7 +332,9 @@ static void update_state(VP9_COMP *cpi, MACROBLOCKD *const xd = &x->e_mbd; MODE_INFO *mi = &ctx->mic; MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi; - int mb_mode = mi->mbmi.mode; +#if CONFIG_DEBUG || CONFIG_INTERNAL_STATS + MB_PREDICTION_MODE mb_mode = mi->mbmi.mode; +#endif int mb_mode_index = ctx->best_mode_index; const int mis = cpi->common.mode_info_stride; const int bh = 1 << mi_height_log2(bsize), bw = 1 << mi_width_log2(bsize); @@ -362,7 +364,8 @@ static void update_state(VP9_COMP *cpi, ctx->txfm_rd_diff[ALLOW_32X32] = ctx->txfm_rd_diff[ALLOW_16X16]; } - if (mb_mode == SPLITMV) { + if (mbmi->ref_frame != INTRA_FRAME && + mbmi->sb_type < BLOCK_SIZE_SB8X8) { vpx_memcpy(x->partition_info, &ctx->partition_info, sizeof(PARTITION_INFO)); @@ -448,7 +451,8 @@ static void update_state(VP9_COMP *cpi, */ // Note how often each mode chosen as best cpi->mode_chosen_counts[mb_mode_index]++; - if (mbmi->mode == SPLITMV || mbmi->mode == NEWMV) { + if (mbmi->ref_frame != INTRA_FRAME && + (mbmi->sb_type < BLOCK_SIZE_SB8X8 || mbmi->mode == NEWMV)) { int_mv best_mv, best_second_mv; MV_REFERENCE_FRAME rf = mbmi->ref_frame; best_mv.as_int = ctx->best_ref_mv.as_int; @@ -1617,7 +1621,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, cpi->zbin_mode_boost = GF_ZEROMV_ZBIN_BOOST; else cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST; - } else if (mbmi->mode == SPLITMV) { + } else if (mbmi->sb_type < BLOCK_SIZE_SB8X8) { cpi->zbin_mode_boost = SPLIT_MV_ZBIN_BOOST; } else { cpi->zbin_mode_boost = MV_ZBIN_BOOST; |