ref: 481b834842e20f031cbb8c72f55239e5fdcdafe2
parent: 1eb760e55d799475b361176bdf9e83532c77e9ba
author: Jingning Han <[email protected]>
date: Fri Sep 11 04:56:06 EDT 2015
Fix vp10 high bit-depth build Change-Id: Ie3daed0b282b43ef81d2f8797ac1f6e8bde7d65e
--- a/vp10/encoder/encodemb.c
+++ b/vp10/encoder/encodemb.c
@@ -962,7 +962,7 @@
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 @@
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 @@
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 @@
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.
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -784,9 +784,7 @@
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 @@
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) {