diff options
| author | JackyChen <jackychen@google.com> | 2014-12-16 11:12:03 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-16 11:12:03 -0800 |
| commit | 603cdcfce58f1e930847f10ff502e7bc10afdcc9 (patch) | |
| tree | 42e79daf724c6b5b491749144c044c2963db52e4 | |
| parent | 581c8dbd3374fa90c0f31573d4c2369604f47721 (diff) | |
| parent | e7bad92689e6dda785ea6edde39bd7740c00a8dd (diff) | |
| download | libvpx-603cdcfce58f1e930847f10ff502e7bc10afdcc9.tar libvpx-603cdcfce58f1e930847f10ff502e7bc10afdcc9.tar.gz libvpx-603cdcfce58f1e930847f10ff502e7bc10afdcc9.tar.bz2 libvpx-603cdcfce58f1e930847f10ff502e7bc10afdcc9.zip | |
Merge "Fixed MFQE crash issue for highbit depth."
| -rw-r--r-- | vp9/common/vp9_postproc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c index 06cb65a98..6b316751b 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c @@ -637,6 +637,12 @@ int vp9_post_proc_frame(struct VP9Common *cm, YV12_BUFFER_CONFIG *const ppbuf = &cm->post_proc_buffer; struct postproc_state *const ppstate = &cm->postproc_state; +#if CONFIG_VP9_HIGHBITDEPTH + const int flag_highbit = 1; +#else + const int flag_highbit = 0; +#endif + if (!cm->frame_to_show) return -1; @@ -693,7 +699,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, "Failed to allocate post-processing buffer"); if ((flags & VP9D_MFQE) && cm->current_video_frame >= 2 && - cm->postproc_state.last_frame_valid && + cm->postproc_state.last_frame_valid && !flag_highbit && cm->postproc_state.last_base_qindex <= last_q_thresh && cm->base_qindex - cm->postproc_state.last_base_qindex >= q_diff_thresh) { vp9_mfqe(cm); |