Fix bitstream error when entropy and adapt_scan on
BUG=aomedia:310 Change-Id: I8e1a1c6d59e3d14ba132d2bbf4e203da26538bde
This commit is contained in:
Родитель
61418bbd1f
Коммит
c71d613097
|
@ -4035,19 +4035,24 @@ void av1_adapt_coef_probs(AV1_COMMON *cm) {
|
||||||
for (tx_size = 0; tx_size < TX_SIZES; tx_size++)
|
for (tx_size = 0; tx_size < TX_SIZES; tx_size++)
|
||||||
adapt_coef_probs(cm, tx_size, count_sat, update_factor);
|
adapt_coef_probs(cm, tx_size, count_sat, update_factor);
|
||||||
|
|
||||||
|
#if CONFIG_ENTROPY
|
||||||
|
if (cm->partial_prob_update == 0)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
#if CONFIG_ADAPT_SCAN
|
#if CONFIG_ADAPT_SCAN
|
||||||
for (tx_size = 0; tx_size < TX_SIZES_ALL; ++tx_size) {
|
for (tx_size = 0; tx_size < TX_SIZES_ALL; ++tx_size) {
|
||||||
#if !(CONFIG_VAR_TX || CONFIG_RECT_TX)
|
#if !(CONFIG_VAR_TX || CONFIG_RECT_TX)
|
||||||
if (tx_size >= TX_SIZES) continue;
|
if (tx_size >= TX_SIZES) continue;
|
||||||
#else
|
#else
|
||||||
if (tx_size > TX_32X16) continue;
|
if (tx_size > TX_32X16) continue;
|
||||||
#endif
|
#endif
|
||||||
for (tx_type = DCT_DCT; tx_type < TX_TYPES; ++tx_type) {
|
for (tx_type = DCT_DCT; tx_type < TX_TYPES; ++tx_type) {
|
||||||
av1_update_scan_prob(cm, tx_size, tx_type, ADAPT_SCAN_UPDATE_RATE_16);
|
av1_update_scan_prob(cm, tx_size, tx_type, ADAPT_SCAN_UPDATE_RATE_16);
|
||||||
av1_update_scan_order_facade(cm, tx_size, tx_type);
|
av1_update_scan_order_facade(cm, tx_size, tx_type);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if CONFIG_ENTROPY
|
#if CONFIG_ENTROPY
|
||||||
|
|
Загрузка…
Ссылка в новой задаче