Merge "Remove test from B_MODE_INFO." into experimental

vp8/common/blockd.h

@@ -237,7 +237,6 @@ union b_mode_info {
   struct {
     B_PREDICTION_MODE first;
 #if CONFIG_HYBRIDTRANSFORM8X8 || CONFIG_HYBRIDTRANSFORM || CONFIG_HYBRIDTRANSFORM16X16
-    B_PREDICTION_MODE test;
     TX_TYPE           tx_type;
 #endif
 

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);

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);