diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-11-08 16:34:49 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-11-08 17:37:50 +0000 |
| commit | 93c3542baf308046ae79ee8abd3abd32875aab8c (patch) | |
| tree | a9d0858a51cf2e933c62f2a68fa970ecfc9a19a0 /multimedia/x265/files/patch-source_x265.h | |
| parent | multimedia/ffmpeg: update to 4.4.1 (diff) | |
multimedia/vmaf: unbreak legacy API consumers after 1868dedecc9a
$ aomenc --tune=vmaf --output=foo.mp4 foo.y4m
Pass 1/2 frame 1/0 0B 0 us 0.00 fpm [ETA unknown] libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.json"
Fatal error: Failed to load VMAF model.
$ ffmpeg -i foo.y4m -i bar.y4m -lavfi libvmaf -f null -
[...]
libvmaf INFO `compute_vmaf()` is deprecated and will be removed in a future libvmaf version
libvmaf ERROR could not read model from path: "/usr/local/share/model/vmaf_v0.6.1.pkl"
libvmaf ERROR support for pkl model files has been removed, use json
libvmaf ERROR problem loading model file: /usr/local/share/model/vmaf_v0.6.1.pkl
[Parsed_libvmaf_0 @ 0x8061b3b40] libvmaf encountered an error, check log for details
(cherry picked from commit 7f163c23e1a732c8b65cb7b8ecfbcd9e8dfd1cd8)
Diffstat (limited to 'multimedia/x265/files/patch-source_x265.h')
| -rw-r--r-- | multimedia/x265/files/patch-source_x265.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/multimedia/x265/files/patch-source_x265.h b/multimedia/x265/files/patch-source_x265.h new file mode 100644 index 000000000000..1fee612613ad --- /dev/null +++ b/multimedia/x265/files/patch-source_x265.h @@ -0,0 +1,13 @@ +https://github.com/Netflix/vmaf/commit/122089fa3d23 + +--- source/x265.h.orig 2020-09-16 15:52:49 UTC ++++ source/x265.h +@@ -733,7 +733,7 @@ typedef struct x265_vmaf_commondata + int enable_conf_interval; + }x265_vmaf_commondata; + +-static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.pkl", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; ++static const x265_vmaf_commondata vcd[] = { { NULL, (char *)"/usr/local/share/model/vmaf_v0.6.1.json", NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 1, 0 } }; + + /* x265 input parameters + * |