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

Merge "Pick up correct dequant for segment with new-quant." into nextgenv2

Browse Source
This commit is contained in:
Debargha Mukherjee
2016-06-15 16:51:38 +00:00
committed by Gerrit Code Review
parent 00b6ad1ebf 1e46c740c3
commit 918ad13b56
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp10/decoder/detokenize.c
View File

@@ -511,7 +511,7 @@ int vp10_decode_block_tokens(MACROBLOCKD *const xd,
pd->dqcoeff, tx_size, tx_type, pd->dqcoeff, tx_size, tx_type,
dequant, dequant,
#if CONFIG_NEW_QUANT #if CONFIG_NEW_QUANT
pd->seg_dequant_nuq[0], pd->seg_dequant_nuq[seg_id],
#endif // CONFIG_NEW_QUANT #endif // CONFIG_NEW_QUANT
ctx, sc->scan, sc->neighbors, r); ctx, sc->scan, sc->neighbors, r);
#else #else
@@ -519,7 +519,7 @@ int vp10_decode_block_tokens(MACROBLOCKD *const xd,
pd->dqcoeff, tx_size, tx_type, pd->dqcoeff, tx_size, tx_type,
dequant, dequant,
#if CONFIG_NEW_QUANT #if CONFIG_NEW_QUANT
pd->seg_dequant_nuq[0], pd->seg_dequant_nuq[seg_id],
#endif // CONFIG_NEW_QUANT #endif // CONFIG_NEW_QUANT
ctx, sc->scan, sc->neighbors, r); ctx, sc->scan, sc->neighbors, r);
#endif // !CONFIG_ANS #endif // !CONFIG_ANS