Merge "Fix tx_type bug in intra4x4 rd loop"
This commit is contained in:
commit
aedc7c59b1
@ -1288,9 +1288,9 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib,
|
|||||||
block, 16),
|
block, 16),
|
||||||
16, &ssz) >> 2;
|
16, &ssz) >> 2;
|
||||||
|
|
||||||
if (best_tx_type != DCT_DCT)
|
if (tx_type != DCT_DCT)
|
||||||
vp9_short_iht4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
|
vp9_short_iht4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
|
||||||
dst, pd->dst.stride, best_tx_type);
|
dst, pd->dst.stride, tx_type);
|
||||||
else
|
else
|
||||||
xd->inv_txm4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
|
xd->inv_txm4x4_add(BLOCK_OFFSET(pd->dqcoeff, block, 16),
|
||||||
dst, pd->dst.stride);
|
dst, pd->dst.stride);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user