Sync ffmpeg-libfdk_aac with regular ffmpeg package
This commit is contained in:
parent
f7bd7da0d7
commit
57bcfc8677
|
@ -10,7 +10,7 @@
|
||||||
_name=ffmpeg
|
_name=ffmpeg
|
||||||
pkgname=ffmpeg-libfdk_aac
|
pkgname=ffmpeg-libfdk_aac
|
||||||
pkgver=4.2.2
|
pkgver=4.2.2
|
||||||
pkgrel=6
|
pkgrel=8
|
||||||
epoch=1
|
epoch=1
|
||||||
pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
|
pkgdesc='Complete solution to record, convert and stream audio and video (with libfdk-aac support)'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
@ -66,6 +66,7 @@ depends=(
|
||||||
speex
|
speex
|
||||||
srt
|
srt
|
||||||
v4l-utils
|
v4l-utils
|
||||||
|
vmaf
|
||||||
xz
|
xz
|
||||||
zlib
|
zlib
|
||||||
|
|
||||||
|
@ -94,8 +95,11 @@ provides=(
|
||||||
"ffmpeg=$pkgver"
|
"ffmpeg=$pkgver"
|
||||||
)
|
)
|
||||||
conflicts=("$_name")
|
conflicts=("$_name")
|
||||||
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0)
|
|
||||||
sha256sums=(SKIP)
|
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0
|
||||||
|
vmaf-model-path.patch)
|
||||||
|
sha256sums=('SKIP'
|
||||||
|
'8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd ffmpeg
|
cd ffmpeg
|
||||||
|
@ -107,6 +111,8 @@ prepare() {
|
||||||
cd ffmpeg
|
cd ffmpeg
|
||||||
|
|
||||||
git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
|
git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
|
||||||
|
|
||||||
|
patch -Np1 -i "${srcdir}/vmaf-model-path.patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
@ -146,6 +152,7 @@ build() {
|
||||||
--enable-libtheora \
|
--enable-libtheora \
|
||||||
--enable-libv4l2 \
|
--enable-libv4l2 \
|
||||||
--enable-libvidstab \
|
--enable-libvidstab \
|
||||||
|
--enable-libvmaf \
|
||||||
--enable-libvorbis \
|
--enable-libvorbis \
|
||||||
--enable-libvpx \
|
--enable-libvpx \
|
||||||
--enable-libwebp \
|
--enable-libwebp \
|
||||||
|
|
|
@ -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},
|
Loading…
Reference in New Issue