commit eecc7370ba387582fc42077de96f8d93c63e4ad3
author James Zern <jzern@google.com> Thu Apr 01 10:38:43 2021 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Apr 21 18:21:17 2021 +0000
tree ca6afac6ca56f4346aafa6675025c198676cdc06
parent 0a5da45c7f942908974f5ab8e107c9fa82048ae7

Revert "av1_cx_iface: restrict g_usage w/CONFIG_REALTIME_ONLY=1"

This reverts commit 790343335bb1a7ae2a1a7616e3ffb54e85d004c4.

This fix has its own side-effects with configurations used by webrtc,
causing the encoder initialization to fail. The unit tests need to be
fixed with CONFIG_REALTIME_ONLY in either case.

Bug: aomedia:3001,aomedia:3013

Change-Id: Ia4d514bf0aa716a216c8f0096e3122f59c6e839f
(cherry picked from commit 4f74b5275f519fcaaad9503116b3c888062a24db)

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index bb4e7f8..f5ddbe4 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -380,11 +380,7 @@
   RANGE_CHECK_HI(extra_cfg, deltaq_mode, DELTA_Q_MODE_COUNT - 1);
   RANGE_CHECK_HI(extra_cfg, deltalf_mode, 1);
   RANGE_CHECK_HI(extra_cfg, frame_periodic_boost, 1);
-#if CONFIG_REALTIME_ONLY
-  RANGE_CHECK(cfg, g_usage, AOM_USAGE_REALTIME, AOM_USAGE_REALTIME);
-#else
-  RANGE_CHECK_HI(cfg, g_usage, AOM_USAGE_ALL_INTRA);
-#endif
+  RANGE_CHECK_HI(cfg, g_usage, 2);
   RANGE_CHECK_HI(cfg, g_threads, MAX_NUM_THREADS);
   RANGE_CHECK(cfg, rc_end_usage, AOM_VBR, AOM_Q);
   RANGE_CHECK_HI(cfg, rc_undershoot_pct, 100);
@@ -3363,7 +3359,6 @@
 };
 
 static const aom_codec_enc_cfg_t encoder_usage_cfg[] = {
-#if !CONFIG_REALTIME_ONLY
   {
       // NOLINT
       AOM_USAGE_GOOD_QUALITY,  // g_usage - non-realtime usage
@@ -3434,7 +3429,6 @@
       { 0, 128, 128, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  // cfg
   },
-#endif  // !CONFIG_REALTIME_ONLY
   {
       // NOLINT
       AOM_USAGE_REALTIME,  // g_usage - real-time usage
@@ -3505,7 +3499,6 @@
       { 0, 128, 128, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  // cfg
   },
-#if !CONFIG_REALTIME_ONLY
   {
       // NOLINT
       AOM_USAGE_ALL_INTRA,  // g_usage - all intra usage
@@ -3576,7 +3569,6 @@
       { 0, 128, 128, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0,   0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  // cfg
   },
-#endif  // !CONFIG_REALTIME_ONLY
 };
 
 // This data structure and function are exported in aom/aomcx.h