Commit f8038850 authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review

Merge "Fix to make intra_only frames decodable out of order" into nextgenv2

parents 4579c5e4 9d078883
...@@ -2894,7 +2894,7 @@ void av1_adapt_coef_probs(AV1_COMMON *cm) { ...@@ -2894,7 +2894,7 @@ void av1_adapt_coef_probs(AV1_COMMON *cm) {
#endif #endif
#if CONFIG_ENTROPY #if CONFIG_ENTROPY
if (cm->last_frame_type == KEY_FRAME) { if (!frame_is_intra_only(cm) && cm->last_frame_type == KEY_FRAME) {
update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY_BITS; /* adapt quickly */ update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY_BITS; /* adapt quickly */
count_sat = COEF_COUNT_SAT_AFTER_KEY_BITS; count_sat = COEF_COUNT_SAT_AFTER_KEY_BITS;
} else { } else {
...@@ -2905,7 +2905,7 @@ void av1_adapt_coef_probs(AV1_COMMON *cm) { ...@@ -2905,7 +2905,7 @@ void av1_adapt_coef_probs(AV1_COMMON *cm) {
update_factor = COEF_MAX_UPDATE_FACTOR_BITS; update_factor = COEF_MAX_UPDATE_FACTOR_BITS;
} }
#else #else
if (cm->last_frame_type == KEY_FRAME) { if (!frame_is_intra_only(cm) && cm->last_frame_type == KEY_FRAME) {
update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY; /* adapt quickly */ update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY; /* adapt quickly */
count_sat = COEF_COUNT_SAT_AFTER_KEY; count_sat = COEF_COUNT_SAT_AFTER_KEY;
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment