commit fa301c7765bda414008afa6b9019d99e227a3633
author Wan-Teh Chang <wtc@google.com> Tue Feb 16 16:27:35 2021 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Feb 17 06:56:26 2021 +0000
tree 56f5dc5e30dac44949f4c2bd88d8c0dfb2440fee
parent d029bcfdaf3c5d77d71f8f61461ce79794a79e01

Use RANGE_CHECK_HI on g_lag_in_frames, kf_max_dist

Use RANGE_CHECK_HI to enforce that g_lag_in_frames and kf_max_dist must
be zero in all intra mode.

BUG=aomedia:2959

Change-Id: Ib1d27ac5aa92e00efb413d9691f8116b09b1161f

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index d306a23..d4c155b 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -393,10 +393,8 @@
     RANGE_CHECK_HI(cfg, g_lag_in_frames, MAX_LAG_BUFFERS);
   }
   if (cfg->g_usage == AOM_USAGE_ALL_INTRA) {
-    if (cfg->g_lag_in_frames != 0)
-      ERROR("g_lag_in_frames must be zero in all intra mode");
-    if (cfg->kf_max_dist != 0)
-      ERROR("kf_max_dist must be zero in all intra mode");
+    RANGE_CHECK_HI(cfg, g_lag_in_frames, 0);
+    RANGE_CHECK_HI(cfg, kf_max_dist, 0);
   }
   RANGE_CHECK_HI(extra_cfg, min_gf_interval, MAX_LAG_BUFFERS - 1);
   RANGE_CHECK_HI(extra_cfg, max_gf_interval, MAX_LAG_BUFFERS - 1);