diff options
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | 005-ffmpeg-add-svt-hevc-g6cca5b9.patch | 97 | ||||
-rw-r--r-- | PKGBUILD | 32 |
3 files changed, 26 insertions, 118 deletions
@@ -1,6 +1,6 @@ pkgbase = ffmpeg-amd-full-git pkgdesc = Complete solution to record, convert and stream audio and video (all possible features for AMD; git version) - pkgver = 6.2.r114211.gaca7037e01 + pkgver = 7.1.r114795.g0e4dfa4709 pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 @@ -80,6 +80,7 @@ pkgbase = ffmpeg-amd-full-git depends = libopenmpt depends = opus depends = qrencode + depends = quirc depends = rav1e depends = rubberband depends = rtmpdump @@ -135,16 +136,16 @@ pkgbase = ffmpeg-amd-full-git provides = ffmpeg-git conflicts = ffmpeg source = git+https://git.ffmpeg.org/ffmpeg.git - source = 005-ffmpeg-add-svt-hevc-g6cca5b9.patch - source = 010-ffmpeg-add-svt-hevc-g6cca5b9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/6cca5b932623d3a1953b165ae6b093ca1325ac44/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch - source = 030-ffmpeg-add-svt-vp9-g43ef8e5.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/43ef8e5e96932421858762392adbbab57c84aebf/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch + source = 010-ffmpeg-add-svt-hevc-ged80959.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ed80959ebb5586aa7763c91a397d44be1798587c/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch + source = 020-ffmpeg-add-svt-hevc-docs-ged80959.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ed80959ebb5586aa7763c91a397d44be1798587c/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch + source = 030-ffmpeg-add-svt-vp9-g3b9a3fa.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/3b9a3fa43da4cc5fe60c7d22afe2be15341392ea/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch source = LICENSE sha256sums = SKIP - sha256sums = 7d7a53ee6826acf44d6729d337f30fa8ebb85011a2793261575b7bad230835cb - sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a - sha256sums = 0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c + sha256sums = 9047e18d34716812d4ea7eafc1d0fd8b376d922a4b6b4dc20237662fcaf0c996 + sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81 + sha256sums = 59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa sha256sums = 06afdb3bc83b670c213f508f4f9fd27d0b4f9005fa00c3f5cf9b648dd8ec2d48 sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 diff --git a/005-ffmpeg-add-svt-hevc-g6cca5b9.patch b/005-ffmpeg-add-svt-hevc-g6cca5b9.patch deleted file mode 100644 index 19e1d33aba5d..000000000000 --- a/005-ffmpeg-add-svt-hevc-g6cca5b9.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- a/010-ffmpeg-add-svt-hevc-g6cca5b9.patch -+++ b/010-ffmpeg-add-svt-hevc-g6cca5b9.patch -@@ -1,36 +1,14 @@ --From 673e67dfff221da589e28216927fe5efd5b40586 Mon Sep 17 00:00:00 2001 --From: Jing Sun <jing.a.sun@intel.com> --Date: Wed, 21 Nov 2018 11:33:04 +0800 --Subject: [PATCH] lavc/svt_hevc: add libsvt hevc encoder wrapper -- --Signed-off-by: Zhengxu Huang <zhengxu.huang@intel.com> --Signed-off-by: Hassene Tmar <hassene.tmar@intel.com> --Signed-off-by: Jun Zhao <jun.zhao@intel.com> --Signed-off-by: Jing Sun <jing.a.sun@intel.com> --Signed-off-by: Austin Hu <austin.hu@intel.com> --Signed-off-by: Christopher Degawa <ccom@randomderp.com> --Signed-off-by: Guo Jiansheng <jiansheng.guo@intel.com> ----- -- configure | 4 + -- libavcodec/Makefile | 1 + -- libavcodec/allcodecs.c | 1 + -- libavcodec/libsvt_hevc.c | 585 +++++++++++++++++++++++++++++++++++++++ -- 4 files changed, 591 insertions(+) -- create mode 100644 libavcodec/libsvt_hevc.c -- --diff --git a/configure b/configure --index c726076da1..c00fcd0294 100755 - --- a/configure - +++ b/configure --@@ -291,6 +291,7 @@ External library support: -+@@ -289,6 +289,7 @@ External library support: - --enable-libwebp enable WebP encoding via libwebp [no] - --enable-libx264 enable H.264 encoding via x264 [no] - --enable-libx265 enable HEVC encoding via x265 [no] - + --enable-libsvthevc enable HEVC encoding via svt [no] -+ --enable-libxeve enable EVC encoding via libxeve [no] -+ --enable-libxevd enable EVC decoding via libxevd [no] - --enable-libxavs enable AVS encoding via xavs [no] -- --enable-libxavs2 enable AVS2 encoding via xavs2 [no] -- --enable-libxcb enable X11 grabbing using XCB [autodetect] --@@ -1852,6 +1853,7 @@ EXTERNAL_LIBRARY_LIST=" -+@@ -1893,6 +1894,7 @@ EXTERNAL_LIBRARY_LIST=" - libsrt - libssh - libsvtav1 -@@ -38,7 +16,7 @@ index c726076da1..c00fcd0294 100755 - libtensorflow - libtesseract - libtheora --@@ -3404,6 +3406,7 @@ vapoursynth_demuxer_deps="vapoursynth" -+@@ -3470,6 +3472,7 @@ vapoursynth_demuxer_deps="vapoursynth" - videotoolbox_suggest="coreservices" - videotoolbox_deps="corefoundation coremedia corevideo" - videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames" -@@ -46,7 +24,7 @@ index c726076da1..c00fcd0294 100755 - - # demuxers / muxers - ac3_demuxer_select="ac3_parser" --@@ -6678,6 +6681,7 @@ enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp -+@@ -6828,6 +6831,7 @@ enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/ - enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init - enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket - enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle -@@ -54,30 +32,26 @@ index c726076da1..c00fcd0294 100755 - enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow - enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate - enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg --diff --git a/libavcodec/Makefile b/libavcodec/Makefile --index 1fb963f820..77c9926ea6 100644 - --- a/libavcodec/Makefile - +++ b/libavcodec/Makefile --@@ -1126,6 +1126,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim -+@@ -1147,6 +1147,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim - OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o - OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o - OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o - +OBJS-$(CONFIG_LIBSVT_HEVC_ENCODER) += libsvt_hevc.o - OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o - OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o -- OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o --diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c --index ff82423a88..57f085415c 100644 -+ OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o - --- a/libavcodec/allcodecs.c - +++ b/libavcodec/allcodecs.c --@@ -812,6 +812,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; -+@@ -821,6 +821,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; - #endif - extern const FFCodec ff_libx264rgb_encoder; - extern FFCodec ff_libx265_encoder; - +extern FFCodec ff_libsvt_hevc_encoder; -+ extern const FFCodec ff_libxeve_encoder; -+ extern const FFCodec ff_libxevd_decoder; - extern const FFCodec ff_libxavs_encoder; -- extern const FFCodec ff_libxavs2_encoder; -- extern const FFCodec ff_libxvid_encoder; - diff --git a/libavcodec/libsvt_hevc.c b/libavcodec/libsvt_hevc.c - new file mode 100644 - index 0000000000..739144ca0c @@ -5,7 +5,7 @@ pkgname=ffmpeg-amd-full-git _srcname=ffmpeg -pkgver=6.2.r114211.gaca7037e01 +pkgver=7.1.r114795.g0e4dfa4709 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)' arch=('x86_64') @@ -20,7 +20,7 @@ depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2' 'libpulse' 'librabbitmq-c' 'librsvg' 'libssh' 'libsoxr' 'libtheora' 'libva' 'libvdpau' 'libvorbis' 'libvpx' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv' 'libwebp' 'lilv' 'lv2' 'ocl-icd' 'openal' 'opencore-amr' 'openh264' 'openjpeg2' - 'libopenmpt' 'opus' 'qrencode' 'rav1e' 'rubberband' 'rtmpdump' 'sdl2' 'smbclient' 'snappy' + 'libopenmpt' 'opus' 'qrencode' 'quirc' 'rav1e' 'rubberband' 'rtmpdump' 'sdl2' 'smbclient' 'snappy' 'sndio' 'speex' 'spirv-tools' 'srt' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract' 'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' 'vulkan-icd-loader' 'x264' 'x265' 'xvidcore' 'xz' 'zeromq' 'zimg' 'zlib' 'zvbi' @@ -32,32 +32,35 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so' 'libpostproc.so' 'libswscale.so' 'libswresample.so' 'ffmpeg' 'ffmpeg-full' 'ffmpeg-git') conflicts=('ffmpeg') -_svt_hevc_ver='6cca5b932623d3a1953b165ae6b093ca1325ac44' -_svt_vp9_ver='43ef8e5e96932421858762392adbbab57c84aebf' +_svt_hevc_ver='ed80959ebb5586aa7763c91a397d44be1798587c' +_svt_vp9_ver='3b9a3fa43da4cc5fe60c7d22afe2be15341392ea' source=("git+https://git.ffmpeg.org/ffmpeg.git" - "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" + #"005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" + #"006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch" - #"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch" + "020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch" "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch" "040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" "060-ffmpeg-fix-segfault-with-avisynthplus.patch" "LICENSE") sha256sums=('SKIP' - '7d7a53ee6826acf44d6729d337f30fa8ebb85011a2793261575b7bad230835cb' - 'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a' - #'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81' - '0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c' + '9047e18d34716812d4ea7eafc1d0fd8b376d922a4b6b4dc20237662fcaf0c996' + 'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81' + '59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa' '06afdb3bc83b670c213f508f4f9fd27d0b4f9005fa00c3f5cf9b648dd8ec2d48' '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440' '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') prepare() { rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c - cp --remove-destination "$(readlink "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch")" \ - "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" - patch -Np1 -i "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" + #cp --remove-destination "$(readlink "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch")" \ + # "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" + #patch -Np1 -i "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" + #cp --remove-destination "$(readlink "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch")" \ + # "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" + #patch -Np1 -i "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" - #patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch" + patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" patch -d ffmpeg -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch" @@ -143,6 +146,7 @@ build() { --enable-libplacebo \ --enable-libpulse \ --enable-libqrencode \ + --enable-libquirc \ --enable-librabbitmq \ --enable-librav1e \ --disable-librist \ |