diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | 010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch | 44 | ||||
| -rw-r--r-- | 010-ffmpeg-fix-vmaf-model-path.patch | 11 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
4 files changed, 53 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) - pkgver = 4.4.r101737.g896395bbcf + pkgver = 5.1.r105398.g2f323b1978 pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 @@ -62,7 +62,7 @@ pkgbase = ffmpeg-git depends = speex depends = srt depends = v4l-utils - depends = vmaf + depends = vmaf-git depends = xz depends = zlib optdepends = avisynthplus: for reading AviSynth scripts as input @@ -80,9 +80,8 @@ pkgbase = ffmpeg-git provides = ffmpeg conflicts = ffmpeg source = git+https://git.ffmpeg.org/ffmpeg.git - source = 010-ffmpeg-fix-vmaf-model-path.patch + source = 010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch sha256sums = SKIP - sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50 + sha256sums = 91973c465f01446a999f278f0c2a3763304994dba1ac35de0e4c72f12f39409e pkgname = ffmpeg-git - diff --git a/010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch b/010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch new file mode 100644 index 000000000000..fb5589800d3d --- /dev/null +++ b/010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch @@ -0,0 +1,44 @@ +From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001 +From: "liberato@chromium.org" <liberato@chromium.org> +Date: Wed, 7 Jul 2021 19:01:22 -0700 +Subject: [PATCH] Add av_stream_get_first_dts for Chromium + +[foutrelis: adjust for new FFStream struct replacing AVStreamInternal] +--- + libavformat/avformat.h | 4 ++++ + libavformat/utils.c | 7 +++++++ + 2 files changed, 11 insertions(+) + +diff --git a/libavformat/avformat.h b/libavformat/avformat.h +index cd7b0d941c..b4a6dce885 100644 +--- a/libavformat/avformat.h ++++ b/libavformat/avformat.h +@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); + */ + int64_t av_stream_get_end_pts(const AVStream *st); + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st); ++// Chromium: We use the internal field first_dts ^^^ ++ + #define AV_PROGRAM_RUNNING 1 + + /** +diff --git a/libavformat/utils.c b/libavformat/utils.c +index de7580c32d..0ef0fe530e 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st) + return AV_NOPTS_VALUE; + } + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st) ++{ ++ return cffstream(st)->first_dts; ++} ++// Chromium: We use the internal field first_dts ^^^ ++ + struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) + { + return st->internal->parser; diff --git a/010-ffmpeg-fix-vmaf-model-path.patch b/010-ffmpeg-fix-vmaf-model-path.patch deleted file mode 100644 index 547b3fe8c0d3..000000000000 --- a/010-ffmpeg-fix-vmaf-model-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 (csv, json or xml).", 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}, @@ -4,7 +4,7 @@ # Contributor: DrZaius <lou at fakeoutdoorsman.com> pkgname=ffmpeg-git -pkgver=4.4.r101737.g896395bbcf +pkgver=5.1.r105398.g2f323b1978 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (git version)' arch=('x86_64') @@ -61,7 +61,7 @@ depends=( speex srt v4l-utils - vmaf + vmaf-git xz zlib ) @@ -83,12 +83,12 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'ffmpeg') conflicts=('ffmpeg') source=('git+https://git.ffmpeg.org/ffmpeg.git' - '010-ffmpeg-fix-vmaf-model-path.patch') + '010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch') sha256sums=('SKIP' - '52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50') + '91973c465f01446a999f278f0c2a3763304994dba1ac35de0e4c72f12f39409e') prepare() { - patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" } pkgver() { |