commit bfd2454bb5d5aeea8641adc5ba76dcc1ad5272ac
author Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Mar 02 11:20:15 2018 +0000
committer Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Mar 02 15:40:54 2018 +0000
tree 8c0b14d47ef49147755691523eeb0472957abc95
parent 4a17335c1d91690bb72c44a259328c84f5904e62

[NORMATIVE] Fixes for lossless frame simplifications

Introduced in Change-Id: I1d2142af3677cdcb34c212cfb54c6c342bc5897b
Introduced in Change-Id: I792a6a09f4cdab4167ce0de6f22826c47479a670

BUG=aomedia:1493

Change-Id: I57a7985f140f1d4a272b7270f59edc33209b2919

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 0fd7d0a..589afa3 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3172,12 +3172,14 @@
   cm->all_lossless = all_lossless(cm, xd);
   setup_segmentation_dequant(cm);
   if (cm->all_lossless) {
-    assert(cm->lf.filter_level[0] == 0 && cm->lf.filter_level[1] == 0);
-    assert(cm->cdef_bits == 0 && cm->cdef_strengths[0] == 0 &&
-           cm->cdef_uv_strengths[0] == 0);
-    assert(cm->rst_info[0].frame_restoration_type == RESTORE_NONE &&
-           cm->rst_info[1].frame_restoration_type == RESTORE_NONE &&
-           cm->rst_info[2].frame_restoration_type == RESTORE_NONE);
+    cm->lf.filter_level[0] = 0;
+    cm->lf.filter_level[1] = 0;
+    cm->cdef_bits = 0;
+    cm->cdef_strengths[0] = 0;
+    cm->cdef_uv_strengths[0] = 0;
+    cm->rst_info[0].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[1].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[2].frame_restoration_type = RESTORE_NONE;
   } else {
     setup_loopfilter(cm, rb);
     setup_cdef(cm, rb);