Rely on a single libavif dep for aom/avm

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.6.4
+
+- Remove the manual libavif+AVM build logic.
+
 ## v0.6.3
 
 - Bump the version of libavif in deps.sh to v1.4.0.

CMakeLists.txt

@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.20)
 project(
   codec-compare-gen
   LANGUAGES CXX
-  VERSION 0.6.3)
+  VERSION 0.6.4)
 set(CMAKE_CXX_STANDARD 17)
 
 option(BUILD_SHARED_LIBS "Build the shared codec-compare-gen library" ON)

README.md

@@ -56,18 +56,6 @@ build/ccgen \
   all repetitions to smooth the timings.
 - `output/encoded` will contain the compressed image files.
 
-#### AVM build
-
-To be able to use `--codec avifavm`, build codec-compare-gen this way:
-
-```sh
-./deps.sh
-mv third_party/libavif third_party/libavif_aom
-mv third_party/libavif_avm third_party/libavif
-cmake -S . -B build -DCMAKE_CXX_COMPILER=clang++
-cmake --build build --parallel
-```
-
 ## Tests
 
 The following instructions are used to make sure the unit tests pass.

deps.sh

@@ -34,24 +34,6 @@ pushd third_party
       -DAVIF_BUILD_TESTS=OFF \
       -DAVIF_CODEC_AOM=LOCAL \
       -DAVIF_CODEC_DAV1D=LOCAL \
-      -DAVIF_LIBYUV=LOCAL \
-      -DAVIF_LIBSHARPYUV=LOCAL \
-      -DAVIF_ENABLE_EXPERIMENTAL_MINI=ON \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
-      -DBUILD_SHARED_LIBS=ON
-    cmake --build build -j${NPROC}
-  popd
-
-  # AVM symbols conflict with AOM so another build of libavif is required.
-  # See https://gitlab.com/AOMediaCodec/avm/-/issues/150.
-  git clone -b v1.4.0 --depth 1 https://github.com/AOMediaCodec/libavif.git libavif_avm
-  pushd libavif_avm
-    git checkout d145e1a32af2915779b27e3b0521b6db08dd6bb8 # v1.4.0
-    cmake -S . -B build \
-      -DAVIF_BUILD_APPS=ON \
-      -DAVIF_BUILD_EXAMPLES=OFF \
-      -DAVIF_BUILD_TESTS=OFF \
       -DAVIF_CODEC_AVM=LOCAL \
       -DAVIF_LIBYUV=LOCAL \
       -DAVIF_LIBSHARPYUV=LOCAL \

src/result_json.cc

@@ -134,16 +134,10 @@ Status TasksToJson(const std::string& batch_pretty_name, CodecSettings settings,
   const std::string encoded_parent = AppendDirectorySeparator(RemovePrefix(
       /*prefix=*/encoded_common_parent.parent_path(), encoded_common_parent));
 
-  const std::string deps_extra_step =
-      settings.codec == Codec::kAvifAvm
-          ? " && mv third_party/libavif third_party/libavif_aom"
-            " && mv third_party/libavif_avm third_party/libavif"
-          : "";
   const std::string build_cmd =
-      "git clone -b v0.6.3 --depth 1"
+      "git clone -b v0.6.4 --depth 1"
       " https://github.com/webmproject/codec-compare-gen.git"
-      " && cd codec-compare-gen && ./deps.sh" +
-      deps_extra_step +
+      " && cd codec-compare-gen && ./deps.sh"
       " && cmake -S . -B build -DCMAKE_CXX_COMPILER=clang++"
       " && cmake --build build --parallel && cd ..";
   const std::string effort_str =