[ffmpeg/f29] Update changelog
by Nicolas Chauvet
commit 9512b9031af9943a3f142a3264ccc76ac99aee23
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 15 17:03:06 2019 +0100
Update changelog
ffmpeg.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 73f2b0a..ee6482b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -89,7 +89,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.0.3
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -434,6 +434,14 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Jan 15 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 4.0.3-2
+- Cherry-pick from master
+- Add omx/omx_rpi
+- Fix for cuda enabled repo
+- Add support for rpi
+- Enable libvmaf for x86_64
+- backport patch for libvmaf support
+
* Sat Nov 03 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.3-1
- Update to 4.0.3 release
5 years, 3 months
[ffmpeg/f29] Add upstream patch for vmaf 1.3.9 support
by Nicolas Chauvet
commit 7f5ac516686c4a5db911d9f5fe28e275da096c60
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 15 17:26:56 2019 +0100
Add upstream patch for vmaf 1.3.9 support
87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch | 84 ++++++++++++++++++++++++++
ffmpeg.spec | 3 +
2 files changed, 87 insertions(+)
---
diff --git a/87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch b/87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch
new file mode 100644
index 0000000..607863a
--- /dev/null
+++ b/87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch
@@ -0,0 +1,84 @@
+commit 87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307
+Author: Kyle Swanson <kswanson(a)netflix.com>
+Date: Tue Aug 7 15:05:16 2018 -0700
+
+ lavfi/vf_libvmaf: update to use libvmaf v1.3.9
+
+ Signed-off-by: Kyle Swanson <kswanson(a)netflix.com>
+
+diff --git a/configure b/configure
+index 15a58935de..e718c1531c 100755
+--- a/configure
++++ b/configure
+@@ -6089,7 +6089,7 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame
+ die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
+ enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl
+ enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
+-enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 0.6.2" libvmaf.h compute_vmaf
++enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 1.3.9" libvmaf.h compute_vmaf
+ enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
+ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init &&
+ require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
+diff --git a/doc/filters.texi b/doc/filters.texi
+index 792edfd2e1..d6c15837f2 100644
+--- a/doc/filters.texi
++++ b/doc/filters.texi
+@@ -10868,7 +10868,7 @@ The obtained VMAF score is printed through the logging system.
+
+ It requires Netflix's vmaf library (libvmaf) as a pre-requisite.
+ After installing the library it can be enabled using:
+-(a)code{./configure --enable-libvmaf}.
++(a)code{./configure --enable-libvmaf --enable-version3}.
+ If no model path is specified it uses the default model: @code{vmaf_v0.6.1.pkl}.
+
+ The filter has following options:
+@@ -10902,6 +10902,15 @@ Enables computing ms_ssim along with vmaf.
+
+ @item pool
+ Set the pool method (mean, min or harmonic mean) to be used for computing vmaf.
++
++@item n_threads
++Set number of threads to be used when computing vmaf.
++
++@item n_subsample
++Set interval for frame subsampling used when computing vmaf.
++
++@item enable_conf_interval
++Enables confidence interval.
+ @end table
+
+ This filter also supports the @ref{framesync} options.
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 5d47a74375..249e50c720 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -62,6 +62,9 @@ typedef struct LIBVMAFContext {
+ int ssim;
+ int ms_ssim;
+ char *pool;
++ int n_threads;
++ int n_subsample;
++ int enable_conf_interval;
+ int error;
+ } LIBVMAFContext;
+
+@@ -78,6 +81,9 @@ static const AVOption libvmaf_options[] = {
+ {"ssim", "Enables computing ssim along with vmaf.", OFFSET(ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+ {"ms_ssim", "Enables computing ms-ssim along with vmaf.", OFFSET(ms_ssim), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+ {"pool", "Set the pool method to be used for computing vmaf.", OFFSET(pool), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
++ {"n_threads", "Set number of threads to be used when computing vmaf.", OFFSET(n_threads), AV_OPT_TYPE_INT, {.i64=0}, 0, UINT_MAX, FLAGS},
++ {"n_subsample", "Set interval for frame subsampling used when computing vmaf.", OFFSET(n_subsample), AV_OPT_TYPE_INT, {.i64=1}, 1, UINT_MAX, FLAGS},
++ {"enable_conf_interval", "Enables confidence interval.", OFFSET(enable_conf_interval), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+ { NULL }
+ };
+
+@@ -166,7 +172,8 @@ static void compute_vmaf_score(LIBVMAFContext *s)
+ read_frame, s, s->model_path, s->log_path,
+ s->log_fmt, 0, 0, s->enable_transform,
+ s->phone_model, s->psnr, s->ssim,
+- s->ms_ssim, s->pool);
++ s->ms_ssim, s->pool,
++ s->n_threads, s->n_subsample, s->enable_conf_interval);
+ }
+
+ static void *call_vmaf(void *ctx)
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1218e00..73f2b0a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -100,6 +100,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
# Upstream commit to fix aom build issue
# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2...
Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch
+# Backport from master to allow vmaf 1.3.9
+Patch1: 87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -325,6 +327,7 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%setup -q -n ffmpeg-%{version}
%endif
%patch0 -p1 -b .aom_build_fix
+%patch1 -p1 -b .vmaf_build
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
5 years, 3 months
[ffmpeg/f29] Add omx/omx_rpi support
by Nicolas Chauvet
commit f0acf4bc794744248cf1c2385753fc62664faabd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Dec 21 14:27:08 2018 +0100
Add omx/omx_rpi support
ffmpeg.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4d5585a..1218e00 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -70,6 +70,8 @@
%endif
%if 0%{?_with_rpi:1}
+%global _with_omx 1
+%global _with_omx_rpi 1
%global _with_mmal 1
ExclusiveArch: armv7hnl
%endif
@@ -153,6 +155,7 @@ BuildRequires: nasm
%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
%{!?_without_nvenc:BuildRequires: nv-codec-headers}
%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
+%{?_with_omx:BuildRequires: libomxil-bellagio-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
%if 0%{!?_without_opencl:1}
BuildRequires: opencl-headers ocl-icd-devel
@@ -272,6 +275,8 @@ This package contains development files for %{name}
%{?_with_netcdf:--enable-netcdf} \\\
%{?_with_mmal:--enable-mmal} \\\
%{!?_without_nvenc:--enable-nvenc} \\\
+ %{?_with_omx:--enable-omx} \\\
+ %{?_with_omx_rpi:--enable-omx-rpi} \\\
%{!?_without_openal:--enable-openal} \\\
%{!?_without_opencl:--enable-opencl} \\\
%{!?_without_opencv:--enable-libopencv} \\\
5 years, 3 months
[ffmpeg/f29] Fixup rpi br
by Nicolas Chauvet
commit bbb6f167cd2b2ecc8e695f98f9f608551633382b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Dec 18 13:32:35 2018 +0100
Fixup rpi br
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2d87aed..4d5585a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -150,7 +150,7 @@ BuildRequires: nasm
%endif
%{?_with_webp:BuildRequires: libwebp-devel}
%{?_with_netcdf:BuildRequires: netcdf-devel}
-%{?_with_rpi:BuildRequires: raspberrypi-vc-libs-devel}
+%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
%{!?_without_nvenc:BuildRequires: nv-codec-headers}
%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
5 years, 3 months
[ffmpeg/f29] Rework build dependencies for cuda
by Nicolas Chauvet
commit b541aeb92ca505731e18db823359feb4afaea9a4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Nov 10 14:31:06 2018 +0100
Rework build dependencies for cuda
ffmpeg.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 10dd94b..2d87aed 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -99,8 +99,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2...
Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_version_rpm} cuda-misc-headers-%{_cuda_version_rpm} cuda-drivers-devel%{_isa} cuda-compiler-%{_cuda_version_rpm} cuda-cudart-dev-%{_cuda_version_rpm}}
-%{?_with_libnpp:BuildRequires: cuda-npp-dev-%{_cuda_version_rpm}}
+%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
+%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
5 years, 3 months
[ffmpeg/f29] Apply path conditionally
by Nicolas Chauvet
commit 60ade1748876c13f5a549cee2e65c4040d5fb1b5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Nov 10 13:36:24 2018 +0100
Apply path conditionally
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 88cb561..10dd94b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -326,7 +326,7 @@ mkdir -p _doc/examples
cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
-export PATH=${PATH}:%{_cuda_bindir}
+%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}}
%{ff_configure}\
--shlibdir=%{_libdir} \
%if 0%{?_without_tools:1}
5 years, 3 months
[ffmpeg/f29] Fixes for cuda enabled repo
by Nicolas Chauvet
commit 2965d22e36f8c71cb053f13ce5ac3d8359d9ffb8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 9 18:36:20 2018 +0100
Fixes for cuda enabled repo
ffmpeg.spec | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1d9cb17..88cb561 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -29,12 +29,12 @@
%endif
# flavor nonfree
-%if 0%{?_with_nonfree:1}
-%global flavor -nonfree
-%global progs_suffix -nonfree
+%if 0%{?_with_cuda:1}
+%global debug_package %{nil}
+%global flavor -cuda
+%global progs_suffix -cuda
#global build_suffix -lgpl
%ifarch %{cuda_arches}
-%global _with_cuda 1
%global _with_cuvid 1
%global _with_libnpp 1
%endif
@@ -42,6 +42,7 @@
%global _without_cdio 1
%global _without_frei0r 1
%global _without_gpl 1
+%global _without_vidstab 1
%global _without_x264 1
%global _without_x265 1
%global _without_xvid 1
@@ -56,10 +57,11 @@
%if 0%{!?_cuda_version:1}
%global _cuda_version 10.0
%endif
-%global _cuda_rpm_version %(echo %{_cuda_version} | sed -e 's/\\./-/')
+%global _cuda_version_rpm %(echo %{_cuda_version} | sed -e 's/\\./-/')
+%global _cuda_bindir %{_cuda_prefix}/bin
%if 0%{?_with_cuda:1}
%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version})
-%global cuda_ldflags -L%{_libdir}/nvidia
+%global cuda_ldflags $(pkg-config --libs cuda-%{_cuda_version})
%endif
%if 0%{?_with_libnpp:1}
@@ -97,8 +99,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2...
Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
-%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
+%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_version_rpm} cuda-misc-headers-%{_cuda_version_rpm} cuda-drivers-devel%{_isa} cuda-compiler-%{_cuda_version_rpm} cuda-cudart-dev-%{_cuda_version_rpm}}
+%{?_with_libnpp:BuildRequires: cuda-npp-dev-%{_cuda_version_rpm}}
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
@@ -324,6 +326,7 @@ mkdir -p _doc/examples
cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
+export PATH=${PATH}:%{_cuda_bindir}
%{ff_configure}\
--shlibdir=%{_libdir} \
%if 0%{?_without_tools:1}
@@ -384,7 +387,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
%ldconfig_scriptlets libs
-%ldconfig_scriptlets libavdevice%{?flavor}
+%ldconfig_scriptlets -n libavdevice%{?flavor}
%if 0%{!?_without_tools:1}
%files
@@ -416,7 +419,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%files devel
%doc MAINTAINERS doc/APIchanges doc/*.txt
%doc _doc/examples
-%{!?flavor:%doc %{_docdir}/%{name}/*.html}
+%doc %{_docdir}/%{name}/*.html
%{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
5 years, 3 months
[ffmpeg/f29] Correct project case, either rpmfusion or RPM Fusion
by Nicolas Chauvet
commit e83888d512f1acd8ba1c58862f74218ca52e911f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 14:03:13 2018 +0100
Correct project case, either rpmfusion or RPM Fusion
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 16e4eef..1d9cb17 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -313,7 +313,7 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
%setup -q -n ffmpeg-%{?branch}%{date}
-echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
+echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
5 years, 3 months
[ffmpeg/f29] Add ExclusiveArch for rpi
by Nicolas Chauvet
commit 0c8ba192e1565c923aba84c8cc28a84c8d95fc04
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:46:12 2018 +0100
Add ExclusiveArch for rpi
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1b93fb7..16e4eef 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -69,6 +69,7 @@
%if 0%{?_with_rpi:1}
%global _with_mmal 1
+ExclusiveArch: armv7hnl
%endif
%if 0%{?_without_gpl}
5 years, 3 months
[ffmpeg/f29] Enable vmaf
by Nicolas Chauvet
commit bae958909c2f28defd68abfa5b22329f5946a467
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 8 10:40:48 2018 +0100
Enable vmaf
ffmpeg.spec | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 96e4e68..1b93fb7 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -22,6 +22,12 @@
%global _without_vpx 1
%endif
+%if 0%{?fedora}
+%ifarch x86_64
+%global _with_vmaf 1
+%endif
+%endif
+
# flavor nonfree
%if 0%{?_with_nonfree:1}
%global flavor -nonfree
@@ -164,6 +170,7 @@ BuildRequires: subversion
#BuildRequires: texi2html
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
+%{?_with_vmaf:BuildRequires: libvmaf-devel}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
@@ -283,6 +290,7 @@ This package contains development files for %{name}
--enable-libvorbis \\\
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
+ %{?_with_vmaf:--enable-libvmaf} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
5 years, 3 months