commit 8fbe1b96d492698556cad761e212dc693bdfe90c
author Fyodor Kyslov <kyslov@google.com> Wed Jul 29 15:54:14 2020 -0700
committer Fyodor Kyslov <kyslov@google.com> Wed Jul 29 15:58:20 2020 -0700
tree 963ae02514d208b2f1832c01c312d6e067f73392
parent d182da4198a1b410f49979bc43ad814263278446

AV1 RT: Disallow non-zero lag-in-frames option for RT mode

Non-zero lag-in-frames should not be allowed in RT mode as it is not
implemented. Implementing this check properly at the end of option
parsing and removing CBR-only condition

BUG=aomedia:2757

Change-Id: Ib6f8273c99d6d3e752f03f0883900d1eb36964be

apps/aomenc.c

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 7c06dfe..450489d 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -1514,12 +1514,6 @@
       config->cfg.g_error_resilient = arg_parse_uint(&arg);
     } else if (arg_match(&arg, &lag_in_frames, argi)) {
       config->cfg.g_lag_in_frames = arg_parse_uint(&arg);
-      if (global->usage == AOM_USAGE_REALTIME &&
-          config->cfg.rc_end_usage == AOM_CBR &&
-          config->cfg.g_lag_in_frames != 0) {
-        warn("non-zero %s option ignored in realtime CBR mode.\n", arg.name);
-        config->cfg.g_lag_in_frames = 0;
-      }
     } else if (arg_match(&arg, &large_scale_tile, argi)) {
       config->cfg.large_scale_tile = arg_parse_uint(&arg);
       if (config->cfg.large_scale_tile) {
@@ -1639,6 +1633,10 @@
   }
   config->use_16bit_internal |= config->cfg.g_bit_depth > AOM_BITS_8;
 
+  if (global->usage == AOM_USAGE_REALTIME && config->cfg.g_lag_in_frames != 0) {
+    warn("non-zero lag-in-frames option ignored in realtime mode.\n");
+    config->cfg.g_lag_in_frames = 0;
+  }
   return eos_mark_found;
 }