commit cb7d3eb737f3fc99e32b07f86de27f887d7a83ea
author Wan-Teh Chang <wtc@google.com> Tue Oct 29 13:47:04 2024 -0700
committer Wan-Teh Chang <wtc@google.com> Tue Oct 29 13:47:04 2024 -0700
tree bc9b29b682062311e26e42ea4548dc061f6fdafb
parent f21be213b7130989c12cca3d7b90194002e4448c

Remove experimental status of AOM_CODEC_USE_PRESET

Make AOM_CODEC_USE_PRESET a supported new feature.

Bug: 359341194
Change-Id: Ieceda7207c3208a1fe4a14b8c73b4439d73a9fab

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index e9f9f2c..7ddd8b0 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2854,9 +2854,6 @@
 
     int extra_cfg_idx = 0;
     if (ctx->init_flags & AOM_CODEC_USE_PRESET) {
-      if (!(ctx->init_flags & AOM_CODEC_USE_EXPERIMENTAL)) {
-        return AOM_CODEC_INCAPABLE;
-      }
       extra_cfg_idx = find_default_extra_cfg_for_usage(priv->cfg.g_usage);
     }
     priv->extra_cfg = default_extra_cfg[extra_cfg_idx];

test/encode_api_test.cc

diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc
index cd3f783..47ddcc1 100644
--- a/test/encode_api_test.cc
+++ b/test/encode_api_test.cc
@@ -115,13 +115,8 @@
   aom_codec_enc_cfg_t cfg;
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_enc_config_default(iface, &cfg, AOM_USAGE_REALTIME));
-  // AOM_CODEC_USE_PRESET is an experimental feature, so
-  // AOM_CODEC_USE_EXPERIMENTAL must also be set.
-  EXPECT_NE(AOM_CODEC_OK,
+  EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_enc_init(&enc, iface, &cfg, AOM_CODEC_USE_PRESET));
-  EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_init(&enc, iface, &cfg,
-                                             AOM_CODEC_USE_EXPERIMENTAL |
-                                                 AOM_CODEC_USE_PRESET));
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
 }