diff options
| author | Adrian Grange <agrange@google.com> | 2014-05-11 09:13:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-11 09:13:55 -0700 |
| commit | 3305909bc2e2d6d9bfe8c01a3fe2324569c84215 (patch) | |
| tree | 63d1456dd152e315c75c79519aa77f63d82b1b10 | |
| parent | e975791564d9e478f907d72bcc1d335d8293d9e8 (diff) | |
| parent | 99892e85d56c2b5f08b1c007943dc3c8758edf0f (diff) | |
| download | libvpx-3305909bc2e2d6d9bfe8c01a3fe2324569c84215.tar libvpx-3305909bc2e2d6d9bfe8c01a3fe2324569c84215.tar.gz libvpx-3305909bc2e2d6d9bfe8c01a3fe2324569c84215.tar.bz2 libvpx-3305909bc2e2d6d9bfe8c01a3fe2324569c84215.zip | |
Merge "Fix check of debug counts for corrupt frame"
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index d2eac8a24..9dd0c4415 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1369,16 +1369,17 @@ int vp9_decode_frame(VP9Decoder *pbi, "A stream must start with a complete key frame"); } - if (!cm->error_resilient_mode && !cm->frame_parallel_decoding_mode && - !new_fb->corrupted) { - vp9_adapt_coef_probs(cm); + if (!new_fb->corrupted) { + if (!cm->error_resilient_mode && !cm->frame_parallel_decoding_mode) { + vp9_adapt_coef_probs(cm); - if (!frame_is_intra_only(cm)) { - vp9_adapt_mode_probs(cm); - vp9_adapt_mv_probs(cm, cm->allow_high_precision_mv); + if (!frame_is_intra_only(cm)) { + vp9_adapt_mode_probs(cm); + vp9_adapt_mv_probs(cm, cm->allow_high_precision_mv); + } + } else { + debug_check_frame_counts(cm); } - } else { - debug_check_frame_counts(cm); } if (cm->refresh_frame_context) |