ffmpeg 4.2.3

3 files changed, 36 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 078e67f0317a..8a4067f3f83b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan  6 00:59:58 UTC 2020
+# Sat May 30 13:07:52 UTC 2020
 pkgbase = ffmpeg-mmal
 	pkgdesc = ffmpeg built with MMAL hardware acceleration support for Raspberry Pi
-	pkgver = 4.2.1
+	pkgver = 4.2.3
 	pkgrel = 1
 	epoch = 1
 	url = https://ffmpeg.org/
@@ -59,6 +59,7 @@ pkgbase = ffmpeg-mmal
 	depends = raspberrypi-firmware
 	depends = sdl2
 	depends = speex
+	depends = srt
 	depends = v4l-utils
 	depends = xz
 	depends = zlib
@@ -73,8 +74,10 @@ pkgbase = ffmpeg-mmal
 	provides = libswresample.so
 	provides = libswscale.so
 	conflicts = ffmpeg
-	source = git+https://git.ffmpeg.org/ffmpeg.git#commit=cbb3c9497549f8856d8cd37ac63af1406a784e58
+	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+	source = vmaf-model-path.patch
 	sha256sums = SKIP
+	sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
 
 pkgname = ffmpeg-mmal
 
diff --git a/PKGBUILD b/PKGBUILD
index ebceabdd872f..8b177a077cbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,12 @@
 #  - use -fPIC in host cflags for v7/v8 to fix print_options.c compile
 #  - remove makedepends on ffnvcodec-headers, remove --enable-nvenc, --enable-nvdec
 #  - remove depends on aom, remove --enable-libaom
+#  - remove depends on intel-media-sdk, remove --enable-libmfx
+#  - remove depends on vmaf, remove --enable-vmaf
 # Upstream: https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/ffmpeg/PKGBUILD
 
 pkgname=ffmpeg-mmal
-_gitcommit=cbb3c9497549f8856d8cd37ac63af1406a784e58
-pkgver=4.2.1
+pkgver=4.2.3
 pkgrel=1
 epoch=1
 pkgdesc='ffmpeg built with MMAL hardware acceleration support for Raspberry Pi'
@@ -67,6 +68,7 @@ depends=(
   raspberrypi-firmware
   sdl2
   speex
+  srt
   v4l-utils
   xz
   zlib
@@ -89,8 +91,12 @@ provides=(
   libswscale.so
 )
 conflicts=('ffmpeg')
-source=("git+https://git.ffmpeg.org/ffmpeg.git#commit=${_gitcommit}")
-sha256sums=(SKIP)
+source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+        vmaf-model-path.patch)
+sha256sums=(
+  SKIP
+  8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+)
 
 pkgver() {
   cd ffmpeg
@@ -101,7 +107,11 @@ pkgver() {
 prepare() {
   cd ffmpeg
 
-  git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+  # lavf/mp3dec: don't adjust start time; packets are not adjusted
+  # https://crbug.com/1062037
+  git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
+
+  patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }
 
 build() {
@@ -114,6 +124,7 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
+    --enable-avisynth \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gnutls \
@@ -137,6 +148,7 @@ build() {
     --enable-libpulse \
     --enable-libsoxr \
     --enable-libspeex \
+    --enable-libsrt \
     --enable-libssh \
     --enable-libtheora \
     --enable-libv4l2 \
diff --git a/vmaf-model-path.patch b/vmaf-model-path.patch
new file mode 100644
index 000000000000..abd65cdf730a
--- /dev/null
+++ b/vmaf-model-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 249e50c720..9b791e19b1 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+ 
+ static const AVOption libvmaf_options[] = {
+-    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+     {"log_path",  "Set the file path to be used to store logs.",                        OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"log_fmt",  "Set the format of the log (xml or json).",                            OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"enable_transform",  "Enables transform for computing vmaf.",                      OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},