commit 021e244a51520aa6f256b174d1087d9d4eba62a4
author JackyChen <jackychen@google.com> Wed Dec 17 09:30:32 2014 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Wed Dec 17 09:30:32 2014 -0800
tree 37c61270f14c0f8189a8faf0d659b14c652ccb46
parent 00d221192998ebd733b69d0c8ff308d13c52aa3c
parent b363cedcd13f39680439d927c9261fd1c53ea1a7

Merge "Use bit_depth in VP9Common as the flag of highbit."

vp9/common/vp9_postproc.c

diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c
index 90b9898..7eac70b 100644
--- a/vp9/common/vp9_postproc.c
+++ b/vp9/common/vp9_postproc.c
@@ -637,12 +637,6 @@
   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;
 
@@ -701,7 +695,7 @@
                        "Failed to allocate post-processing buffer");
 
   if ((flags & VP9D_MFQE) && cm->current_video_frame >= 2 &&
-      cm->postproc_state.last_frame_valid && !flag_highbit &&
+      cm->postproc_state.last_frame_valid && cm->bit_depth == 8 &&
       cm->postproc_state.last_base_qindex <= last_q_thresh &&
       cm->base_qindex - cm->postproc_state.last_base_qindex >= q_diff_thresh) {
     vp9_mfqe(cm);