From 03dceb6c206130e5b0f0275f2e4dc0262cf61cdf Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 11 Jan 2024 15:33:49 +0100 Subject: [PATCH] Bump AVM to research-v6.0.0 (#1927) --- ext/avm.cmd | 2 +- src/obu.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ext/avm.cmd b/ext/avm.cmd index 50412d592c..fb1260f54f 100755 --- 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-v5.0.0 --depth 1 https://gitlab.com/AOMediaCodec/avm.git +git clone -b research-v6.0.0 --depth 1 https://gitlab.com/AOMediaCodec/avm.git cd avm diff --git a/src/obu.c b/src/obu.c index bcc893e122..6f4f5e943d 100644 --- a/src/obu.c +++ b/src/obu.c @@ -41,6 +41,10 @@ #if defined(AVIF_CODEC_AVM) #include "config/aom_config.h" +#if CONFIG_LR_IMPROVEMENTS +#include "av1/common/enums.h" +#include "av1/common/restoration.h" +#endif #endif // --------------------------------------------------------------------------- @@ -378,10 +382,15 @@ static avifBool parseAV2SequenceHeader(avifBits * bits, avifSequenceHeader * hea avifBitsRead(bits, 2); // enable_superres, enable_cdef if (avifBitsRead(bits, 1)) { // enable_restoration -#if CONFIG_LR_FLEX_SYNTAX - avifBitsRead(bits, 2 + CONFIG_PC_WIENER + CONFIG_WIENER_NONSEP); // lr_tools_disable_mask[0] - if (avifBitsRead(bits, 1)) { // uv_neq_y - avifBitsRead(bits, 2 + CONFIG_WIENER_NONSEP); // lr_tools_disable_mask[1] +#if CONFIG_LR_IMPROVEMENTS + avifBitsRead(bits, RESTORE_SWITCHABLE_TYPES); // lr_tools_disable_mask[0] + if (avifBitsRead(bits, 1)) { + for (int i = 1; i < RESTORE_SWITCHABLE_TYPES; ++i) { + if (DEF_UV_LR_TOOLS_DISABLE_MASK & (1 << i)) { + continue; + } + avifBitsRead(bits, 1); // lr_tools_disable_mask[1] + } } #endif }