diff options
author | Adrian Grange <agrange@google.com> | 2012-10-12 15:08:24 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-12 15:08:24 -0700 |
commit | 6e3c7849f704255c9432f1cfdd6a7d1d8ea0e818 (patch) | |
tree | e3094fa59db23190eeb3565b5dfa6cd2a8c6b9dc /vp8 | |
parent | 707e6c301ef9aab779ab685646d0514b6b148835 (diff) | |
parent | 5a4ea8bea6e3a056cd077fb39a913e0690ec8fee (diff) | |
download | libvpx-6e3c7849f704255c9432f1cfdd6a7d1d8ea0e818.tar libvpx-6e3c7849f704255c9432f1cfdd6a7d1d8ea0e818.tar.gz libvpx-6e3c7849f704255c9432f1cfdd6a7d1d8ea0e818.tar.bz2 libvpx-6e3c7849f704255c9432f1cfdd6a7d1d8ea0e818.zip |
Merge "Remove reverting of tx-select if only a single txfm-size is used." into experimental
Diffstat (limited to 'vp8')
-rw-r--r-- | vp8/encoder/encodeframe.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 1606a19ba..4f2437fac 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1458,6 +1458,32 @@ static int check_dual_ref_flags(VP8_COMP *cpi) { } } +#if CONFIG_TX_SELECT +static void reset_skip_txfm_size(VP8_COMP *cpi, TX_SIZE txfm_max) { + VP8_COMMON *cm = &cpi->common; + int mb_row, mb_col, mis = cm->mode_info_stride; + MODE_INFO *mi, *mi_ptr = cm->mi; + MB_MODE_INFO *mbmi; + MACROBLOCK *x = &cpi->mb; + MACROBLOCKD *xd = &x->e_mbd; + + for (mb_row = 0; mb_row < cm->mb_rows; mb_row++, mi_ptr += mis) { + mi = mi_ptr; + for (mb_col = 0; mb_col < cm->mb_cols; mb_col++, mi++) { + mbmi = &mi->mbmi; + if (mbmi->txfm_size > txfm_max) { + int segment_id = mbmi->segment_id; + xd->mode_info_context = mi; + assert((segfeature_active(xd, segment_id, SEG_LVL_EOB) && + get_segdata(xd, segment_id, SEG_LVL_EOB) == 0) || + (cm->mb_no_coeff_skip && mbmi->mb_skip_coeff)); + mbmi->txfm_size = txfm_max; + } + } + } +} +#endif + void vp8_encode_frame(VP8_COMP *cpi) { if (cpi->sf.RD) { int i, frame_type, pred_type; @@ -1606,8 +1632,10 @@ void vp8_encode_frame(VP8_COMP *cpi) { if (count4x4 == 0 && count16x16 == 0) { cpi->common.txfm_mode = ALLOW_8X8; + reset_skip_txfm_size(cpi, TX_8X8); } else if (count8x8 == 0 && count16x16 == 0 && count8x8_8x8p == 0) { cpi->common.txfm_mode = ONLY_4X4; + reset_skip_txfm_size(cpi, TX_4X4); } else if (count8x8 == 0 && count4x4 == 0) { cpi->common.txfm_mode = ALLOW_16X16; } |