diff --git a/0001-build-unbreak-x86-builds.patch b/0001-build-unbreak-x86-builds.patch deleted file mode 100644 index 35fc23f..0000000 --- a/0001-build-unbreak-x86-builds.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ecaeef0b1804c150d3f5a0b11b99aea9746a1d6 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sat, 17 Oct 2020 18:55:44 +0200 -Subject: [PATCH] build: unbreak x86 builds - -SSE is not guaranteed to be present on x86 hosts, so i386..i686 -compilers default to -mno-sse. That however makes the build fail -because vmaf unconditionally uses emmintrin functions which are -not available under no-sse. ppc64le builds however are just fine, so... - -Change the macro guarding emmintrin to not match on x86-like -architectures, but to match on the enablement of SSE2. The macro -"__SSE2__" is the gcc name and is true whenever -msse2 is enabled -(explicitly or implicitly); clang should behave the same. I have not -tested this under other compilers such as Microsoft, though. - -Fixes: #374 ---- - libvmaf/src/feature/adm_tools.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvmaf/src/feature/adm_tools.c b/libvmaf/src/feature/adm_tools.c -index 86e122b..c141b1a 100644 ---- a/libvmaf/src/feature/adm_tools.c -+++ b/libvmaf/src/feature/adm_tools.c -@@ -35,7 +35,7 @@ - #define MIN(x, y) (((x) < (y)) ? (x) : (y)) - #define MAX(x, y) (((x) > (y)) ? (x) : (y)) - --#if ARCH_X86 -+#ifdef __SSE2__ - #ifdef ADM_OPT_RECIP_DIVISION - - #include -@@ -50,7 +50,7 @@ static float rcp_s(float x) - #endif //ADM_OPT_RECIP_DIVISION - #else - #define DIVS(n, d) ((n) / (d)) --#endif //ARCH_X86 -+#endif // __SSE2__ - - static const float dwt2_db2_coeffs_lo_s[4] = { 0.482962913144690, 0.836516303737469, 0.224143868041857, -0.129409522550921 }; - static const float dwt2_db2_coeffs_hi_s[4] = { -0.129409522550921, -0.224143868041857, 0.836516303737469, -0.482962913144690 }; --- -2.28.0 - diff --git a/baselibs.conf b/baselibs.conf index 3edcf22..3b1a130 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libvmaf0 +libvmaf1 diff --git a/v1.5.3.tar.gz b/v1.5.3.tar.gz deleted file mode 100644 index 06c4f38..0000000 --- a/v1.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:440652ae417d88be083ffd9fa5967662172601e31c458a9743f6008d7150c900 -size 9044760 diff --git a/v2.1.0.tar.gz b/v2.1.0.tar.gz new file mode 100644 index 0000000..ed6a133 --- /dev/null +++ b/v2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9f484346ea796b0a1e400503a8a147c664a50f0d6851bb97e6030258c1faeac +size 10142449 diff --git a/vmaf.changes b/vmaf.changes index 4eab77b..d5d3e5d 100644 --- a/vmaf.changes +++ b/vmaf.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Jan 7 15:37:35 UTC 2021 - ecsos + +- Update to 2.1.0 + * New features: + - Per-model feature overloading via new API + vmaf_model_feature_overload(). + - Multiple unique configurations of the same feature extractor + may be registered run at the same time. + - --aom_ctc v1.0 preset, encompassing all metrics specified by + the AOM CTC. +- Changes from 2.0.0 + * New features: + - Add PSNR-HVS and CIEDE2000 metrics. + - ci/actions: upload linux/macos artifacts (#738) + - libvmaf/feature: deprecate daala_ssim (#735) + - libvmaf: remove support for pkl models + - libvmaf/psnr: rewrite using integer types, 2x speedup + - vmaf: if no model is specified, enable v0.6.1 by default (#730) + - libvmaf/x86: add AVX2/AVX-512 optimizations for adm, vif and + motion + - ci/actions: add xxd to build dependencies for Windows + - libvmaf: add support for built-in models + - libvmaf/integer_vif: use symmetrical mirroring on edges + - Fix log2 by replacing log2f_approx with log2f + - libvmaf_rc: provide a backwards compatible compute_vmaf(), + link vmafossexec with libvmaf + - libvmaf: add framework support for json models + - libvmaf/libsvm: update libsvm to version 324 + - libvmaf/motion: add motion_force_zero to motion fex + - return sha1 if Asset string is longer than 255 + - Add CID/iCID Matlab source code + - build: unbreak x86 builds (Fixes: #374) + - Add 12bit and 16bit support for python YUV reader; add tests. + - Add PypsnrFeatureExtractor + - Add processes to FeatureAssembler. (#662) + * Fixed bugs: + - fix motion flush for single frame input + - Fixing the perf_metric for a single entry list input +- Drop 0001-build-unbreak-x86-builds.patch, because now in upstream. +- Remove data subpackage because models now build in. + ------------------------------------------------------------------- Mon Oct 19 12:06:33 UTC 2020 - Jan Engelhardt diff --git a/vmaf.spec b/vmaf.spec index 17592b5..f4d16f9 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -1,7 +1,7 @@ # # spec file for package vmaf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,11 @@ # +%define soname 1 +%define lname libvmaf%{soname} + Name: vmaf -%define lname libvmaf0 -Version: 1.5.3 +Version: 2.1.0 Release: 0 Summary: Perceptual video quality assessment algorithm License: BSD-2-Clause-Patent AND BSD-3-Clause @@ -26,7 +28,6 @@ Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://github.com/Netflix/vmaf Source: https://github.com/Netflix/vmaf/archive/v%version.tar.gz Source9: baselibs.conf -Patch1: 0001-build-unbreak-x86-builds.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: meson >= 0.47 @@ -45,18 +46,6 @@ Recommends: %name-data %description -n %lname VMAF is a perceptual video quality assessment algorithm. -%package data -Summary: Models for Video Multi-Method Assessment Fusion -Group: Productivity/Multimedia/Video/Editors and Convertors -BuildArch: noarch - -%description data -This package contains a number of trained VMAF models to be used in -different scenarios. Besides the default VMAF model which predicts -the quality of a video displayed on a HDTV in a living-room viewing -condition, a number of additional models are included, covering -mobile phone and 4KTV viewing conditions. - %package devel Summary: Development tools for Video Multi-Method Assessment Fusion Group: Development/Libraries/C and C++ @@ -68,7 +57,7 @@ Netflix. This package contains the library API definitions. %prep -%autosetup -p1 +%autosetup %build rm -rf third_party @@ -88,10 +77,7 @@ rm -f "%buildroot/%_libdir"/*.a %postun -n %lname -p /sbin/ldconfig %files -n %lname -%_libdir/libvmaf.so.0* - -%files data -%_datadir/model/ +%_libdir/libvmaf.so.%{soname}* %files devel %_bindir/vmaf*