Update to libaom v3.14.0
Delete the AomTuneMetricTest.TuneIqOnlySupportsAllIntra test (added in
PR #2936) because tune IQ was extended to inter-frame encoding modes
(good-quality and realtime) in libaom v3.14.0:
https://aomedia-review.googlesource.com/207681
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b8b58d..9d381aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@
* Require C11 for compilation. Public headers will remain C99.
* Add --jobs flag to avifgainmaputil and enable auto tiling.
* Use AOM_TUNE_IQ for layered image inter-frame encoding.
-* Update aom.cmd/LocalAom.cmake: v3.13.3
+* Update aom.cmd/LocalAom.cmake: v3.14.0
* Update LocalAvm.cmake: research-v15.0.0
* Update svt.cmd/svt.sh/LocalSvt.cmake: v4.1.0
* Fix decoding layered image with multiple scaled alpha layers
diff --git a/cmake/Modules/LocalAom.cmake b/cmake/Modules/LocalAom.cmake
index 985b585..f1f37de 100644
--- a/cmake/Modules/LocalAom.cmake
+++ b/cmake/Modules/LocalAom.cmake
@@ -1,4 +1,4 @@
-set(AVIF_AOM_GIT_TAG v3.13.3)
+set(AVIF_AOM_GIT_TAG v3.14.0)
set(AOM_EXT_SOURCE_DIR "${AVIF_SOURCE_DIR}/ext/aom")
set(LIB_FILENAME "${AOM_EXT_SOURCE_DIR}/build.libavif/${CMAKE_STATIC_LIBRARY_PREFIX}aom${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/ext/aom.cmd b/ext/aom.cmd
index d05cd52..5f0ce89 100755
--- a/ext/aom.cmd
+++ b/ext/aom.cmd
@@ -8,7 +8,7 @@
: # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir):
: # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
-git clone -b v3.13.3 --depth 1 https://aomedia.googlesource.com/aom
+git clone -b v3.14.0 --depth 1 https://aomedia.googlesource.com/aom
cmake -G Ninja -S aom -B aom/build.libavif -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0
cmake --build aom/build.libavif --config Release --parallel
diff --git a/tests/gtest/aviftunetest.cc b/tests/gtest/aviftunetest.cc
index 890ba6e..387ef24 100644
--- a/tests/gtest/aviftunetest.cc
+++ b/tests/gtest/aviftunetest.cc
@@ -212,26 +212,6 @@
EXPECT_EQ(a, b);
}
-TEST(AomTuneMetricTest, TuneIqOnlySupportsAllIntra) {
- if (avifCodecName(AVIF_CODEC_CHOICE_AOM, AVIF_CODEC_FLAG_CAN_ENCODE) ==
- nullptr) {
- GTEST_SKIP() << "Codec unavailable, skip test.";
- }
-
- const ImagePtr image =
- testutil::ReadImage(data_path, "paris_exif_xmp_icc.jpg");
- ASSERT_NE(image, nullptr);
-
- EncoderPtr encoder(avifEncoderCreate());
- ASSERT_NE(encoder, nullptr);
- encoder->codecChoice = AVIF_CODEC_CHOICE_AOM;
- ASSERT_EQ(avifEncoderSetCodecSpecificOption(encoder.get(), "tune", "iq"),
- AVIF_RESULT_OK);
- ASSERT_EQ(avifEncoderAddImage(encoder.get(), image.get(), kDuration,
- AVIF_ADD_IMAGE_FLAG_NONE),
- AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION);
-}
-
//------------------------------------------------------------------------------
} // namespace