Bump AVM to research-8.0.0 (AOMediaCodec#2437)

makesoftwaresafe · Oct 9, 2024 · 5ae2a41 · 5ae2a41
1 parent 69e57b6
commit 5ae2a41
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ The changes are relative to the previous release, unless the baseline is specifi
   is true.
 * Write an empty HandlerBox name field instead of "libavif" (saves 7 bytes).
 * Update aom.cmd/LocalAom.cmake: v3.10.0
+* Update avm.cmd: research-v8.0.0
 * Update svt.cmd/svt.sh/LocalSvt.cmake: v2.2.1
 * Change experimental gainmap API: remove avifGainMapMetadata and
   avifGainMapMetadataDouble structs.

diff --git a/cmake/Modules/LocalAom.cmake b/cmake/Modules/LocalAom.cmake
@@ -1,5 +1,5 @@
 set(AVIF_LOCAL_AOM_GIT_TAG v3.10.0)
-set(AVIF_LOCAL_AVM_GIT_TAG research-v7.0.1)
+set(AVIF_LOCAL_AVM_GIT_TAG research-v8.0.0)
 
 if(AVIF_CODEC_AVM)
     # Building the avm repository generates files such as "libaom.a" because it is a fork of aom,
@@ -98,6 +98,8 @@ else()
             GIT_SHALLOW ON
             UPDATE_COMMAND ""
         )
+        # This will disable the tensorflow dependency.
+        set(CONFIG_ML_PART_SPLIT 0 CACHE INTERNAL "")
     else()
         FetchContent_Declare(
             libaom URL "https://aomedia.googlesource.com/aom/+archive/${AVIF_LOCAL_AOM_GIT_TAG}.tar.gz" BINARY_DIR

diff --git a/ext/avm.cmd b/ext/avm.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 research-v7.0.1 --depth 1 https://gitlab.com/AOMediaCodec/avm.git
+git clone -b research-v8.0.0 --depth 1 https://gitlab.com/AOMediaCodec/avm.git
 
 cd avm
 

diff --git a/src/obu.c b/src/obu.c
@@ -372,21 +372,17 @@ static avifBool parseAV2SequenceHeader(avifBits * bits, avifSequenceHeader * hea
 
     // See av1_read_sequence_header() in avm.
     AVIF_CHECK(parseSequenceHeaderFrameMaxDimensions(bits, header));
-#if CONFIG_BLOCK_256
     if (!avifBitsRead(bits, 1)) // BLOCK_256X256
-#endif
-        avifBitsRead(bits, 1); // BLOCK_128X128
+        avifBitsRead(bits, 1);  // BLOCK_128X128
     AVIF_CHECK(parseSequenceHeaderEnabledFeatures(bits, header));
 
     avifBitsRead(bits, 2);       // enable_superres, enable_cdef
     if (avifBitsRead(bits, 1)) { // enable_restoration
-#if CONFIG_LR_IMPROVEMENTS
         const int lr_tools_disable_mask_length = /*RESTORE_SWITCHABLE_TYPES=*/5 - 1;
         avifBitsRead(bits, lr_tools_disable_mask_length); // lr_tools_disable_mask[0]
         if (avifBitsRead(bits, 1)) {
             avifBitsRead(bits, lr_tools_disable_mask_length - 1); // lr_tools_disable_mask[1]
         }
-#endif
     }
 
     // See av1_read_color_config() in avm.