commit e60599ade4d97b80315c17cc1edd14c3734b10d2
author Urvang Joshi <urvang@google.com> Tue Mar 06 12:57:02 2018 -0800
committer Urvang Joshi <urvang@google.com> Wed Mar 07 02:58:46 2018 +0000
tree 6672cf4bbdc6b54fd29406c5a72e2023fa88f49b
parent b4720d35768bf54d01aaa7a38f07c146aa18d512

Bugfix: assertion when encoding multiple keyframes

BUG=aomedia:1514

Change-Id: I6868bac0cb525263edb1ed0a6939dc8a60181d27

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 2e0cc96..11512a4 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -901,9 +901,12 @@
 
 static void write_cdef(AV1_COMMON *cm, aom_writer *w, int skip, int mi_col,
                        int mi_row) {
-  if (cm->all_lossless) return;
-  if (cm->allow_intrabc && NO_FILTER_FOR_IBC) {
-    assert(cm->cdef_bits == 0);
+  if (cm->all_lossless || (cm->allow_intrabc && NO_FILTER_FOR_IBC)) {
+    // Initialize to indicate no CDEF for safety.
+    cm->cdef_bits = 0;
+    cm->cdef_strengths[0] = 0;
+    cm->nb_cdef_strengths = 1;
+    cm->cdef_uv_strengths[0] = 0;
     return;
   }