Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump AVM to research-v6.0.0 #1927

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Bump AVM to research-v6.0.0 #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a562c4
Bump AVM to research-v6.0.0
vrabaud Jan 11, 2024
8f8c427
Add comment.
vrabaud Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/avm.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 13 additions & 4 deletions src/obu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two headers are internal headers. We should avoid including them. At least add a TODO comment.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, fixed in #1928

#endif
#endif

// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -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)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the original AVM variable name as a comment for future reference

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

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
}
Expand Down
Loading