generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix vp10 high bit-depth build

Browse Source 
Change-Id: Ie3daed0b282b43ef81d2f8797ac1f6e8bde7d65e
This commit is contained in:
Jingning Han
2015-09-11 08:56:06 -07:00
parent 1eb760e55d
commit 481b834842
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp10/encoder/encodemb.c
View File

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

6
vp10/encoder/rdopt.c
View File

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