From: JackyChen <jackychen@google.com>
Date: Tue, 16 Dec 2014 18:02:47 +0000 (-0800)
Subject: Fixed MFQE crash issue for highbit depth.
X-Git-Tag: v1.4.0~348^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7bad92689e6dda785ea6edde39bd7740c00a8dd;p=libvpx

Fixed MFQE crash issue for highbit depth.

Check the flags, no MFQE for highbit now. Will add highbit support
latter.

Change-Id: I548c27593e0f47ab7f4c92b45f14fb037dc86591
---

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);