commit 9dccdf24d9ebbb30483da4b54a7cb97e9cdf44c1
author Cheng Chen <chengchen@google.com> Mon Oct 02 15:04:40 2017 -0700
committer Cheng Chen <chengchen@google.com> Wed Oct 04 16:33:46 2017 +0000
tree a9fe0c6b9b1d8b10320d6d99fa5436aed93188eb
parent aaf262f900051d9de7abcd72602b7a4e9cccba9e

Clamp current_delta_lf_from_base in ext_delta_q

BUG=aomedia:829

Change-Id: I78347e12b4efa05ebd424ba25de7767437495b42

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 9503dc8..5473199 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1142,10 +1142,12 @@
         xd->prev_delta_lf_from_base = xd->current_delta_lf_from_base;
       }
 #else
-      mbmi->current_delta_lf_from_base = xd->current_delta_lf_from_base =
+      const int current_delta_lf_from_base =
           xd->prev_delta_lf_from_base +
           read_delta_lflevel(cm, xd, r, mbmi, mi_col, mi_row) *
               cm->delta_lf_res;
+      mbmi->current_delta_lf_from_base = xd->current_delta_lf_from_base =
+          clamp(current_delta_lf_from_base, 0, MAX_LOOP_FILTER);
       xd->prev_delta_lf_from_base = xd->current_delta_lf_from_base;
 #endif  // CONFIG_LOOPFILTER_LEVEL
     }
@@ -2897,10 +2899,12 @@
         xd->prev_delta_lf_from_base = xd->current_delta_lf_from_base;
       }
 #else
-      mbmi->current_delta_lf_from_base = xd->current_delta_lf_from_base =
+      const int current_delta_lf_from_base =
           xd->prev_delta_lf_from_base +
           read_delta_lflevel(cm, xd, r, mbmi, mi_col, mi_row) *
               cm->delta_lf_res;
+      mbmi->current_delta_lf_from_base = xd->current_delta_lf_from_base =
+          clamp(current_delta_lf_from_base, 0, MAX_LOOP_FILTER);
       xd->prev_delta_lf_from_base = xd->current_delta_lf_from_base;
 #endif  // CONFIG_LOOPFILTER_LEVEL
     }

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 2913e73..e9dcb4f 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4730,7 +4730,8 @@
         for (j = 0; j < AOMMIN(cm->mib_size, cm->mi_rows - mi_row); j++) {
           for (k = 0; k < AOMMIN(cm->mib_size, cm->mi_cols - mi_col); k++) {
             cm->mi[(mi_row + j) * cm->mi_stride + (mi_col + k)]
-                .mbmi.current_delta_lf_from_base = current_delta_lf_from_base;
+                .mbmi.current_delta_lf_from_base =
+                clamp(current_delta_lf_from_base, 0, MAX_LOOP_FILTER);
 #if CONFIG_LOOPFILTER_LEVEL
             for (int lf_id = 0; lf_id < FRAME_LF_COUNT; ++lf_id) {
               cm->mi[(mi_row + j) * cm->mi_stride + (mi_col + k)]