diff options
| author | Daniel Kang <ddkang@google.com> | 2012-08-06 14:45:40 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-06 16:39:05 -0700 |
| commit | 106815f830c9874ee9c663124b3ff41f095219ab (patch) | |
| tree | e3e9bb24d248ea70520a66089f3961758648cf57 /vp8 | |
| parent | 6630895daf020374ab3e708b61036b94eb7a5962 (diff) | |
| download | libvpx-106815f830c9874ee9c663124b3ff41f095219ab.tar libvpx-106815f830c9874ee9c663124b3ff41f095219ab.tar.gz libvpx-106815f830c9874ee9c663124b3ff41f095219ab.tar.bz2 libvpx-106815f830c9874ee9c663124b3ff41f095219ab.zip | |
Remove code to set transform size.
It's reset in calling functions.
Change-Id: Ia5df086de615aac6feb3c911fe298626a002b850
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/rdopt.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index b165c3033..3f2b8e85c 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -4050,33 +4050,6 @@ int vp8cx_pick_mode_inter_macroblock cpi->comp_pred_count[pred_context]++; } - /* test code: set transform size based on mode selection */ -#if CONFIG_TX16X16 - if (xd->mode_info_context->mbmi.mode <= TM_PRED || - xd->mode_info_context->mbmi.mode == NEWMV || - xd->mode_info_context->mbmi.mode == ZEROMV || - xd->mode_info_context->mbmi.mode == NEARMV || - xd->mode_info_context->mbmi.mode == NEARESTMV) { - xd->mode_info_context->mbmi.txfm_size = TX_16X16; - cpi->t16x16_count++; - } - else if (cpi->common.txfm_mode == ALLOW_8X8 - && xd->mode_info_context->mbmi.mode != I8X8_PRED - && xd->mode_info_context->mbmi.mode != B_PRED - && xd->mode_info_context->mbmi.mode != SPLITMV) { -#else - if (cpi->common.txfm_mode == ALLOW_8X8 - && xd->mode_info_context->mbmi.mode != I8X8_PRED - && xd->mode_info_context->mbmi.mode != B_PRED - && xd->mode_info_context->mbmi.mode != SPLITMV) { -#endif - xd->mode_info_context->mbmi.txfm_size = TX_8X8; - cpi->t8x8_count++; - } else { - xd->mode_info_context->mbmi.txfm_size = TX_4X4; - cpi->t4x4_count++; - } - /* restore cpi->zbin_mode_boost_enabled */ cpi->zbin_mode_boost_enabled = zbin_mode_boost_enabled; } |