Merge "Fix vp10 high bit-depth build"

vp10/encoder/encodemb.c

@@ -962,7 +962,7 @@ void vp10_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
                                       qcoeff, dqcoeff, pd->dequant, eob,
                                       scan_order->scan, scan_order->iscan);
         }
-        if (!x->skip_encode && *eob)
+        if (*eob)
           vp10_highbd_inv_txfm_add_32x32(dqcoeff, dst, dst_stride, *eob, xd->bd,
                                          tx_type);
         break;
@@ -976,7 +976,7 @@ void vp10_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
                                 pd->dequant, eob,
                                 scan_order->scan, scan_order->iscan);
         }
-        if (!x->skip_encode && *eob)
+        if (*eob)
           vp10_highbd_inv_txfm_add_16x16(dqcoeff, dst, dst_stride, *eob, xd->bd,
                                          tx_type);
         break;
@@ -990,7 +990,7 @@ void vp10_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
                                 pd->dequant, eob,
                                 scan_order->scan, scan_order->iscan);
         }
-        if (!x->skip_encode && *eob)
+        if (*eob)
           vp10_highbd_inv_txfm_add_8x8(dqcoeff, dst, dst_stride, *eob, xd->bd,
                                        tx_type);
         break;
@@ -1006,7 +1006,7 @@ void vp10_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
                                 scan_order->scan, scan_order->iscan);
         }
 
-        if (!x->skip_encode && *eob)
+        if (*eob)
           // this is like vp10_short_idct4x4 but has a special case around
           // eob<=1 which is significant (not just an optimization) for the
           // lossless case.

vp10/encoder/rdopt.c

@@ -784,9 +784,7 @@ static int64_t rd_pick_intra4x4block(VP10_COMP *cpi, MACROBLOCK *x,
                                                                   p->src_diff);
           tran_low_t *const coeff = BLOCK_OFFSET(x->plane[0].coeff, block);
           xd->mi[0]->bmi[block].as_mode = mode;
-          vp10_predict_intra_block(xd, 1, TX_4X4, mode,
-                                  x->skip_encode ? src : dst,
-                                  x->skip_encode ? src_stride : dst_stride,
+          vp10_predict_intra_block(xd, 1, TX_4X4, mode, dst, dst_stride,
                                   dst, dst_stride,
                                   col + idx, row + idy, 0);
           vpx_highbd_subtract_block(4, 4, src_diff, 8, src, src_stride,
@@ -849,7 +847,7 @@ static int64_t rd_pick_intra4x4block(VP10_COMP *cpi, MACROBLOCK *x,
     next_highbd:
       {}
     }
-    if (best_rd >= rd_thresh || x->skip_encode)
+    if (best_rd >= rd_thresh)
       return best_rd;
 
     for (idy = 0; idy < num_4x4_blocks_high * 4; ++idy) {