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

Merge changes I92819356,I50b5a313,I807e60c6,I8a8df9fd into nextgenv2

Browse Source 
* changes:
  Branch dct to new implementation for bd12
  Change dct32x32's range
  Fit dct's stage range into 32-bit when bitdepth is 12
  Pass tx_type into get_tx_scale
This commit is contained in:
Angie Chiang
2016-04-13 23:24:41 +00:00
committed by Gerrit Code Review
parent 91c985fc28 ff8c490b9a
commit 716f0ea3cf
8 changed files with 120 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp10/decoder/decodeframe.c
View File

@@ -291,7 +291,7 @@ static void predict_and_reconstruct_intra_block(MACROBLOCKD *const xd,
token_tab,
#endif // CONFIG_ANS
plane, sc, col, row, tx_size,
r, mbmi->segment_id);
tx_type, r, mbmi->segment_id);
inverse_transform_block(xd, plane, tx_type, tx_size,
dst, pd->dst.stride, eob);
}
@@ -327,7 +327,7 @@ static void decode_reconstruct_tx(MACROBLOCKD *const xd, vp10_reader *r,
const scan_order *sc = get_scan(tx_size, tx_type, 1);
const int eob = vp10_decode_block_tokens(xd, plane, sc,
blk_col, blk_row, tx_size,
r, mbmi->segment_id);
tx_type, r, mbmi->segment_id);
inverse_transform_block(xd, plane, tx_type, tx_size,
&pd->dst.buf[4 * blk_row * pd->dst.stride + 4 * blk_col],
pd->dst.stride, eob);
@@ -373,7 +373,8 @@ static int reconstruct_inter_block(MACROBLOCKD *const xd,
#if CONFIG_ANS
token_tab,
#endif
plane, sc, col, row, tx_size, r,
plane, sc, col, row,
tx_size, tx_type, r,
mbmi->segment_id);
inverse_transform_block(xd, plane, tx_type, tx_size,