diff options
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 88943330f..9f3268021 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -871,8 +871,9 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m, if (((rf == INTRA_FRAME && mode != I4X4_PRED) || (rf != INTRA_FRAME && mode != SPLITMV)) && pc->txfm_mode == TX_MODE_SELECT && - !(skip_coeff || vp9_segfeature_active(xd, segment_id, - SEG_LVL_SKIP))) + !(rf != INTRA_FRAME && + (skip_coeff || vp9_segfeature_active(xd, segment_id, + SEG_LVL_SKIP)))) #endif { TX_SIZE sz = mi->txfm_size; @@ -941,7 +942,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, !(skip_coeff || vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP))) { #else if (ym != I4X4_PRED && c->txfm_mode == TX_MODE_SELECT && - !(skip_coeff || vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP))) { + !(m->mbmi.ref_frame != INTRA_FRAME && (skip_coeff || + vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)))) { #endif TX_SIZE sz = m->mbmi.txfm_size; // FIXME(rbultje) code ternary symbol once all experiments are merged |