Merge "Fix check of debug counts for corrupt frame"

This commit is contained in:
Adrian Grange 2014-05-11 09:13:55 -07:00 committed by Gerrit Code Review
commit 3305909bc2

View File

@ -1369,8 +1369,8 @@ int vp9_decode_frame(VP9Decoder *pbi,
"A stream must start with a complete key frame"); "A stream must start with a complete key frame");
} }
if (!cm->error_resilient_mode && !cm->frame_parallel_decoding_mode && if (!new_fb->corrupted) {
!new_fb->corrupted) { if (!cm->error_resilient_mode && !cm->frame_parallel_decoding_mode) {
vp9_adapt_coef_probs(cm); vp9_adapt_coef_probs(cm);
if (!frame_is_intra_only(cm)) { if (!frame_is_intra_only(cm)) {
@ -1380,6 +1380,7 @@ int vp9_decode_frame(VP9Decoder *pbi,
} else { } else {
debug_check_frame_counts(cm); debug_check_frame_counts(cm);
} }
}
if (cm->refresh_frame_context) if (cm->refresh_frame_context)
cm->frame_contexts[cm->frame_context_idx] = cm->fc; cm->frame_contexts[cm->frame_context_idx] = cm->fc;