Switch back dav1d-git to dav1d. Update intel svt hevc patches.

3 files changed, 50 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5693d0112c48..a3d72ad6af4e 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.2.r94300.gaf5f770113
+	pkgver = 4.3.r94501.g33186028fc
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -29,6 +29,7 @@ pkgbase = ffmpeg-full-git
 	depends = libcaca
 	depends = celt
 	depends = libcdio-paranoia
+	depends = dav1d
 	depends = libdc1394
 	depends = libavc1394
 	depends = libfdk-aac
@@ -90,7 +91,6 @@ pkgbase = ffmpeg-full-git
 	depends = libdrm
 	depends = libvdpau
 	depends = chromaprint-fftw
-	depends = dav1d-git
 	depends = codec2
 	depends = davs2
 	depends = flite1-patched
@@ -124,14 +124,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.3.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.3.0/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	source = ffmpeg-full-git-add-intel-svt-hevc-docs-1.3.0.patch
+	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 = LICENSE
 	sha256sums = SKIP
-	sha256sums = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d
-	sha256sums = d6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5
+	sha256sums = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554
+	sha256sums = 1b3708496be453267be9699753c110ae171024db140e6a8d7fd68ac61845334b
 	sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
 	sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/PKGBUILD b/PKGBUILD
index 2a35ecd4cdda..52a216ef5b4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
-_svt_hevc_ver='1.3.0'
+_svt_hevc_ver='1.4.0'
 _svt_av1_ver='0.6.0'
 _svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
 
 pkgname=ffmpeg-full-git
-pkgver=4.2.r94300.gaf5f770113
+pkgver=4.3.r94501.g33186028fc
 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')
@@ -15,17 +15,18 @@ depends=(
     # official repositories:
         'glibc' 'alsa-lib' 'jack' 'libpng'
         'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom'
-        'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394'
-        'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm'
-        'libiec61883' 'lensfun' 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2' 'opus'
-        'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt'
-        'libssh' 'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab'
-        'libvorbis' 'libvpx' 'wavpack' 'libwebp' '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'
+        'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'dav1d'
+        'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi'
+        'libgme' 'gsm' 'libiec61883' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
+        'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy'
+        'libsoxr' 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora'
+        'twolame' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp'
+        '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'
     # AUR:
-        'chromaprint-fftw' 'dav1d-git' 'codec2' 'davs2' 'flite1-patched' 'libilbc'
+        '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'
@@ -42,13 +43,13 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
 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-${_svt_hevc_ver}.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"
         'LICENSE')
 sha256sums=('SKIP'
-            'cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d'
-            'd6f29cbe57cba0fdfcb97111aa089154509db3a7bfdfa7f978692b68652e6fb5'
+            'd9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554'
+            '1b3708496be453267be9699753c110ae171024db140e6a8d7fd68ac61845334b'
             '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
             '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
@@ -58,7 +59,7 @@ prepare() {
     
     # 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-${_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"
 }
diff --git a/ffmpeg-full-git-add-intel-svt-hevc-docs-1.3.0.patch b/ffmpeg-full-git-add-intel-svt-hevc-docs.patch
index 1ed8a785ddb8..4998042c1db4 100644
--- a/ffmpeg-full-git-add-intel-svt-hevc-docs-1.3.0.patch
+++ b/ffmpeg-full-git-add-intel-svt-hevc-docs.patch
@@ -1,23 +1,7 @@
-From 0bb8d7cd4131b1c6d29d57c709ce6f3a6b246031 Mon Sep 17 00:00:00 2001
-From: Jun Zhao <mypopydev@gmail.com>
-Date: Sat, 8 Dec 2018 15:43:05 +0800
-Subject: [PATCH 2/2] doc: Add libsvt_hevc encoder docs
-
-Add docs for libsvt_hevc encoder in encoders.texi and general.texi
-
-Signed-off-by: Jun Zhao <jun.zhao@intel.com>
-Signed-off-by: Huang, Zhengxu <zhengxu.huang@intel.com>
-Signed-off-by: hassene <hassene.tmar@intel.com>
----
- doc/encoders.texi | 157 ++++++++++++++++++++++++++++++++++++++++++++++
- doc/general.texi  |   8 +++
- 2 files changed, 165 insertions(+)
-
-diff --git a/doc/encoders.texi b/doc/encoders.texi
-index 899faac49b..0a19596299 100644
---- a/doc/encoders.texi
-+++ b/doc/encoders.texi
-@@ -1457,6 +1457,163 @@ Set maximum NAL size in bytes.
+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
  
@@ -42,12 +26,8 @@ index 899faac49b..0a19596299 100644
 +@item b  (@emph{bitrate})
 +Set the bitrate (as a number of bits per second). Default is 7M.
 +
-+@item refs (@emph{ref})
-+Number of reference frames each P-frame can use. The range is from @var{0-16}.
-+Default is 0(disabled).
-+
 +@item g  / @option{gop_size}
-+Set the GOP size. Default is 64.
++Set the GOP size. Default is -2 (unspecified).
 +
 +@item flags +cgop
 +Enable closed GOP.
@@ -59,7 +39,7 @@ index 899faac49b..0a19596299 100644
 +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 0(cqp) mode.
++(Only used when bit rate control mode @option{rc} is set to 1(vbr) mode.
 +Has to be qmax > = qmin).
 +
 +@item profile (@emph{profile})
@@ -76,10 +56,8 @@ index 899faac49b..0a19596299 100644
 +
 +@item level
 +
-+@option{profile} sets the value of @emph{profile_idc} and the @emph{constraint_set*_flag}s.
-+@option{level} sets the value of @emph{level_idc}.
-+
-+@end table
++@option{profile} sets the value of @emph{profile}.
++@option{level} sets the value of @emph{level}.
 +
 +The encoder also has its own specific options:
 +
@@ -113,18 +91,6 @@ index 899faac49b..0a19596299 100644
 +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 intra_ref_type
-+Set intra refesh type. Can assume one of the following possible values:
-+
-+Default is 2 (idr).
-+
-+@table @samp
-+@item cra
-+open group of pictures
-+@item idr
-+closed group of pictures
-+@end table
-+
 +@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,
@@ -165,29 +131,34 @@ index 899faac49b..0a19596299 100644
 +@item tune
 +Set quality tuning mode. Can assume one of the following possible values:
 +
-+Default is 1 (objective).
++Default is 1 (oq).
 +
 +@table @samp
-+@item subjective
-+Subjective quality mode
-+@item objective
-+Objective quality mode for PSNR / SSIM / VMAF benchmarking
++@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 --git a/doc/general.texi b/doc/general.texi
-index 2b015f143a..070997aa6f 100644
---- a/doc/general.texi
-+++ b/doc/general.texi
-@@ -280,6 +280,14 @@ The dispatcher is open source and can be downloaded from
- with the @code{--enable-libmfx} option and @code{pkg-config} needs to be able to
- locate the dispatcher's @code{.pc} files.
+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
 +
@@ -197,9 +168,6 @@ index 2b015f143a..070997aa6f 100644
 +for installing the library. Pass @code{--enable-libsvthevc} to configure to
 +enable it.
 +
- @section Kvazaar
+ @section TwoLAME
  
- FFmpeg can make use of the Kvazaar library for HEVC encoding.
--- 
-2.17.1
-
+ FFmpeg can make use of the TwoLAME library for MP2 encoding.