commit dad63d450486ceee80a2fd8418c5d91381d5ab5b
author Yunqing Wang <yunqingwang@google.com> Fri Dec 08 12:45:07 2017 -0800
committer Yunqing Wang <yunqingwang@google.com> Mon Dec 11 16:59:39 2017 +0000
tree 461a3d798bf3df1d07df046985462a268efabe3f
parent a734551e59d29bcce9d4cc6eba6a04671be4d407

Add 1 condition in CDEF checking

Added "cm->cdef_strengths[0] == 0" in CDEF checking.

Change-Id: I5a63b4b9835665cc90966ad1ade8c3e16f0a2d79

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index cb5dbbf..395de75 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1666,7 +1666,7 @@
     const int no_loopfilter = !lf->filter_level;
 #endif
     const int no_cdef = cm->cdef_bits == 0 && cm->cdef_strengths[0] == 0 &&
-                        cm->nb_cdef_strengths == 1;
+                        cm->cdef_uv_strengths[0] == 0;
 #if CONFIG_LOOP_RESTORATION
     const int no_restoration =
         cm->rst_info[0].frame_restoration_type == RESTORE_NONE &&
@@ -3082,6 +3082,7 @@
     cm->cdef_bits = 0;
     cm->cdef_strengths[0] = 0;
     cm->nb_cdef_strengths = 1;
+    cm->cdef_uv_strengths[0] = 0;
 #if CONFIG_LOOP_RESTORATION
     cm->rst_info[0].frame_restoration_type = RESTORE_NONE;
     cm->rst_info[1].frame_restoration_type = RESTORE_NONE;

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 14c85e9..ee3d40a 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4739,6 +4739,7 @@
     cm->cdef_bits = 0;
     cm->cdef_strengths[0] = 0;
     cm->nb_cdef_strengths = 1;
+    cm->cdef_uv_strengths[0] = 0;
   } else {
     // Find CDEF parameters
     av1_cdef_search(cm->frame_to_show, cpi->source, cm, xd,