Update svt-hevc patches to version 1.4.1

3 files changed, 24 insertions, 197 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d5f939b0da8..03a43a470de3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
-	pkgver = 4.3.r94694.g95780f4dcb
+	pkgver = 4.3.r94891.ge1dd355b3d
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -91,6 +91,8 @@ pkgbase = ffmpeg-full-git
 	depends = libva
 	depends = libdrm
 	depends = libvdpau
+	depends = svt-hevc
+	depends = svt-av1
 	depends = chromaprint-fftw
 	depends = codec2
 	depends = davs2
@@ -108,8 +110,6 @@ pkgbase = ffmpeg-full-git
 	depends = pocketsphinx
 	depends = intel-media-sdk
 	depends = rockchip-mpp
-	depends = intel-svt-hevc
-	depends = intel-svt-av1
 	depends = svt-vp9-git
 	provides = libavcodec.so
 	provides = libavdevice.so
@@ -125,14 +125,14 @@ pkgbase = ffmpeg-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	source = ffmpeg-full-git-add-intel-svt-hevc-1.4.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.0/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	source = ffmpeg-full-git-add-intel-svt-hevc-docs.patch
-	source = ffmpeg-full-git-add-intel-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
-	source = ffmpeg-full-git-add-intel-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
+	source = ffmpeg-full-git-add-svt-hevc-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+	source = ffmpeg-full-git-add-svt-hevc-docs-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+	source = ffmpeg-full-git-add-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+	source = ffmpeg-full-git-add-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554
-	sha256sums = 1b3708496be453267be9699753c110ae171024db140e6a8d7fd68ac61845334b
+	sha256sums = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883
+	sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
 	sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
 	sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/PKGBUILD b/PKGBUILD
index f5ccd486ff60..7a8537ffd583 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
-_svt_hevc_ver='1.4.0'
+_svt_hevc_ver='1.4.1'
 _svt_av1_ver='0.6.0'
 _svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
 
 pkgname=ffmpeg-full-git
-pkgver=4.3.r94694.g95780f4dcb
+pkgver=4.3.r94891.ge1dd355b3d
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
 arch=('x86_64')
@@ -24,12 +24,12 @@ depends=(
         'libx264.so'  'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi'
         'lv2' 'lilv' 'xz' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
         'libxv' 'libx11'  'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libva'
-        'libdrm' 'libvdpau'
+        'libdrm' 'libvdpau' 'svt-hevc' 'svt-av1'
     # AUR:
         'chromaprint-fftw' 'codec2' 'davs2' 'flite1-patched' 'libilbc'
         'libklvanc-git' 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc'
         'xavs' 'xavs2' 'libmysofa' 'pocketsphinx' 'intel-media-sdk' 'rockchip-mpp'
-        'intel-svt-hevc' 'intel-svt-av1' 'svt-vp9-git'
+        'svt-vp9-git'
 )
 makedepends=(
     # official repositories:
@@ -42,14 +42,14 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libswresample.so' 'ffmpeg' 'ffmpeg-full' 'ffmpeg-git')
 conflicts=('ffmpeg')
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
-        "ffmpeg-full-git-add-intel-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
-        "ffmpeg-full-git-add-intel-svt-hevc-docs.patch"
-        "ffmpeg-full-git-add-intel-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
-        "ffmpeg-full-git-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch"
+        "ffmpeg-full-git-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
+        "ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
+        "ffmpeg-full-git-add-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
+        "ffmpeg-full-git-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch"
         'LICENSE')
 sha256sums=('SKIP'
-            'd9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554'
-            '1b3708496be453267be9699753c110ae171024db140e6a8d7fd68ac61845334b'
+            'd2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883'
+            '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
             '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
             '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
@@ -57,11 +57,11 @@ sha256sums=('SKIP'
 prepare() {
     cd ffmpeg
     
-    # add intel-svt support for hevc, av1 and vp9
-    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-${_svt_hevc_ver}.patch"
-    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-hevc-docs.patch"
-    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-av1-${_svt_av1_ver}.patch"
-    git apply --index "${srcdir}/ffmpeg-full-git-add-intel-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+    # add svt codec support for hevc, av1 and vp9
+    git apply --index "${srcdir}/ffmpeg-full-git-add-svt-hevc-${_svt_hevc_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-svt-av1-${_svt_av1_ver}.patch"
+    git apply --index "${srcdir}/ffmpeg-full-git-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
 }
 
 pkgver() {
diff --git a/ffmpeg-full-git-add-intel-svt-hevc-docs.patch b/ffmpeg-full-git-add-intel-svt-hevc-docs.patch
deleted file mode 100644
index 4998042c1db4..000000000000
--- a/ffmpeg-full-git-add-intel-svt-hevc-docs.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -Nawurp a/doc/encoders.texi b/doc/encoders.texi
---- a/doc/encoders.texi	2019-08-11 14:00:13.000000000 +0000
-+++ b/doc/encoders.texi	2019-08-11 14:00:13.000000000 +0000
-@@ -1640,6 +1640,151 @@ Set maximum NAL size in bytes.
- Allow skipping frames to hit the target bitrate if set to 1.
- @end table
- 
-+@section libsvt_hevc
-+
-+Scalable Video Technology for HEVC encoder (SVT-HEVC encoder) wrapper.
-+
-+This encoder requires the presence of the headers and
-+library during configuration. You need to explicitly configure the
-+build with @code{--enable-libsvthevc}. The library is detected using
-+@command{pkg-config}.
-+
-+For more information about the library see
-+@url{https://github.com/intel/SVT-HEVC.git}.
-+
-+@subsection Options
-+
-+The following FFmpeg global options affect the configurations of the
-+libsvt_hevc encoder.
-+
-+@table @option
-+@item b  (@emph{bitrate})
-+Set the bitrate (as a number of bits per second). Default is 7M.
-+
-+@item g  / @option{gop_size}
-+Set the GOP size. Default is -2 (unspecified).
-+
-+@item flags +cgop
-+Enable closed GOP.
-+
-+@item qmin (@emph{min-q})
-+Defaults 10
-+
-+@item qmax (@emph{max-q})
-+Defaults 48
-+
-+Set minimum/maximum quantisation values.  Valid range is from 0 to 51
-+(Only used when bit rate control mode @option{rc} is set to 1(vbr) mode.
-+Has to be qmax > = qmin).
-+
-+@item profile (@emph{profile})
-+Set profile restrictions. Can assume one of the following possible values:
-+
-+Default is 2 (main10).
-+
-+@table @samp
-+@item main
-+main profile
-+@item main10
-+main10 profile
-+@end table
-+
-+@item level
-+
-+@option{profile} sets the value of @emph{profile}.
-+@option{level} sets the value of @emph{level}.
-+
-+The encoder also has its own specific options:
-+
-+@table @option
-+@item vui
-+Enables or disables the vui structure in the HEVC elementary
-+bitstream. 0 = Off, 1 = On. Default is 0 (Off).
-+
-+@item aud (@emph{aud})
-+Enable use of access unit delimiters when set to 1. Default is 0 (Off).
-+
-+@item hielevel
-+Set hierarchical levels. Can assume one of the following possible values:
-+
-+Default is 3 (4level).
-+
-+@table @samp
-+@item flat
-+none hierarchy level
-+@item 2level
-+2-level hierarchy
-+@item 3level
-+3-level hierarchy
-+@item 4level
-+4-level hierarchy
-+@end table
-+
-+@item la_depth
-+Set look-ahead depth, depending on bit rate control mode @option{rc}, when
-+bit rate control mode is set to vbr it's best to set this parameter to be
-+equal to the intra period value (such is the default set by the encoder),
-+when cqp is chosen, then a look ahead is recommended. The range is from @var{0-256}.
-+
-+@item preset
-+A preset defining the quality vs density tradeoff point that the
-+encoding is to be performed at.(e.g. 0 is the highest quality mode,
-+12 is the highest density mode). The range is from @var{0-12}. Default is 9.
-+
-+@item tier
-+Set @emph{general_tier_flag}.  This may affect the level chosen for the stream
-+if it is not explicitly specified. Can assume one of the following possible values:
-+
-+Default is 1 (main).
-+
-+@table @samp
-+@item main
-+main tier
-+@item high
-+high tier
-+@end table
-+
-+@item rc
-+Set bit rate control mode. Can assume one of the following possible values:
-+
-+Default is 0 (cqp).
-+
-+@table @samp
-+@item cqp
-+Constant QP (CQP) mode
-+@item vbr
-+Variable Bit Rate (VBR) mode
-+@end table
-+
-+@item qp
-+Initial quantization parameter for the intra pictures used when
-+@option{rc} is cqp mode. The range is from @var{0-51}. Default is 32.
-+
-+@item sc_detection
-+Enables or disables the scene change detection algorithm. Default is 0 (disable).
-+
-+@item tune
-+Set quality tuning mode. Can assume one of the following possible values:
-+
-+Default is 1 (oq).
-+
-+@table @samp
-+@item sq
-+Visually optimized mode
-+@item oq
-+PSNR / SSIM optimized mode
-+@item vmaf
-+VMAF optimized mode
-+@end table
-+
-+@item bl_mode
-+Enables or disables Random Access Prediction. Default is 0 (disable).
-+@end table
-+
-+@item hdr
-+High dynamic range input. Default is 0 (disable).
-+@end table
-+
- @section libtheora
- 
- libtheora Theora encoder wrapper.
-diff -Nawurp a/doc/general.texi b/doc/general.texi
---- a/doc/general.texi	2019-08-11 14:00:13.000000000 +0000
-+++ b/doc/general.texi	2019-08-11 14:00:13.000000000 +0000
-@@ -243,6 +243,14 @@ FFmpeg can use the OpenJPEG libraries fo
- instructions.  To enable using OpenJPEG in FFmpeg, pass @code{--enable-libopenjpeg} to
- @file{./configure}.
- 
-+@section Scalable Video Technology for HEVC
-+
-+FFmpeg can make use of the SVT-HEVC library for HEVC encoding.
-+
-+Go to @url{https://github.com/intel/SVT-HEVC.git} and follow the instructions
-+for installing the library. Pass @code{--enable-libsvthevc} to configure to
-+enable it.
-+
- @section TwoLAME
- 
- FFmpeg can make use of the TwoLAME library for MP2 encoding.