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

Merge "Fix txb_w/h use case in av1_tx_block_rd_b()" into nextgenv2

Browse Source
This commit is contained in:
Jingning Han
2016-11-03 19:31:48 +00:00
committed by Gerrit Code Review
parent 565f788de9 4b47c937d0
commit a504e77a98
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
av1/encoder/rdopt.c
View File

@@ -3013,8 +3013,8 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param); inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
if (txb_h + blk_col > max_blocks_wide || if (txb_w + blk_col > max_blocks_wide ||
txb_w + blk_row > max_blocks_high) { txb_h + blk_row > max_blocks_high) {
int idx, idy; int idx, idy;
unsigned int this_dist; unsigned int this_dist;
int blocks_height = AOMMIN(txb_h, max_blocks_high - blk_row); int blocks_height = AOMMIN(txb_h, max_blocks_high - blk_row);