diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-01-25 19:23:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-01-25 19:23:55 -0800 |
| commit | e893af1283e996ca356a7f99932aa558bdef6c1e (patch) | |
| tree | f893d3f15d2ecc5bf315a9eca537bad5db8864da /vp8/decoder | |
| parent | 1a0f52485a8d34c0a2cfe1df09e58300962628f6 (diff) | |
| parent | 0c2919c3d57c92db996531b17255c6c444375600 (diff) | |
| download | libvpx-e893af1283e996ca356a7f99932aa558bdef6c1e.tar.gz | |
Merge "Bug fix: error-concealment enabled changed postproc output"
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 9f58bfd2b..cb51c2b02 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -386,7 +386,13 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, vp8_clear_system_state(); -#if CONFIG_ERROR_CONCEALMENT + if (cm->show_frame) + { + cm->current_video_frame++; + cm->show_frame_mi = cm->mi; + } + + #if CONFIG_ERROR_CONCEALMENT /* swap the mode infos to storage for future error concealment */ if (pbi->ec_enabled && pbi->common.prev_mi) { @@ -408,9 +414,6 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size, } #endif - if (cm->show_frame) - cm->current_video_frame++; - pbi->ready_for_new_data = 0; pbi->last_time_stamp = time_stamp; |