diff options
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/encodeintra.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index eacae81d6..8021055d1 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -74,7 +74,6 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, #if CONFIG_HYBRIDTRANSFORM if (x->q_index < ACTIVE_HT) { - b->bmi.as_mode.test = b->bmi.as_mode.first; txfm_map(b, b->bmi.as_mode.first); vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4); vp8_ht_quantize_b_4x4(be, b); diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index fe6b7de6d..bb2160701 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1182,6 +1182,7 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be, // Do we need to do this for mode2 also? if (mode == B_LD_PRED || mode == B_VL_PRED) continue; + b->bmi.as_mode.first = mode; rate = bmode_costs[mode]; #if CONFIG_COMP_INTRA_PRED @@ -1200,7 +1201,6 @@ static int64_t rd_pick_intra4x4block(VP8_COMP *cpi, MACROBLOCK *x, BLOCK *be, #if CONFIG_HYBRIDTRANSFORM if (active_ht) { - b->bmi.as_mode.test = mode; txfm_map(b, mode); vp8_fht_c(be->src_diff, be->coeff, 32, b->bmi.as_mode.tx_type, 4); vp8_ht_quantize_b_4x4(be, b); |