Patch aom to support built-in vmaf models

This commit is contained in:
BtbN 2021-04-15 21:43:35 +02:00
parent a3cf605fa9
commit 08b987be81
2 changed files with 33 additions and 0 deletions

View file

@ -0,0 +1,24 @@
From cc9db1c519dc00966ba8d8cdb4328698dfff9f80 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 15 Apr 2021 21:38:32 +0200
Subject: [PATCH] Fall back to built-in vmaf model on load failure
---
aom_dsp/vmaf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/aom_dsp/vmaf.c b/aom_dsp/vmaf.c
index 219e27830..6625f05c1 100644
--- a/aom_dsp/vmaf.c
+++ b/aom_dsp/vmaf.c
@@ -37,6 +37,7 @@ void aom_init_vmaf_model(VmafModel **vmaf_model, const char *model_path) {
model_cfg.name = "vmaf";
if (vmaf_model_load_from_path(vmaf_model, &model_cfg, model_path)) {
+ if (vmaf_model_load(vmaf_model, &model_cfg, "vmaf_v0.6.1"))
vmaf_fatal_error("Failed to load VMAF model.");
}
}
--
2.25.1

View file

@ -7,10 +7,19 @@ ffbuild_enabled() {
return 0 return 0
} }
ffbuild_dockerstage() {
to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
}
ffbuild_dockerbuild() { ffbuild_dockerbuild() {
git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom
cd aom cd aom
for patch in /patches/*.patch; do
echo "Applying $patch"
git am < "$patch"
done
mkdir cmbuild && cd cmbuild mkdir cmbuild && cd cmbuild
# Workaround broken build system # Workaround broken build system