CI Linux FFmpeg: update SVT-HEVC patch

the older seem no longer apply with the last 5000 commits from FFmpeg Git

rebased upon current FFmpeg Git master
This commit is contained in:
Martin Pulec
2025-08-20 12:04:39 +02:00
parent b2bb169ad9
commit fd47df644c

View File

@@ -1,4 +1,4 @@
From 3d2c2bba486f11f7a55eaf8b51159dea19c03231 Mon Sep 17 00:00:00 2001
From 19f4bd57e3d60dc6e40bc1ff96fbb91916dd7cc4 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
@@ -21,18 +21,18 @@ UPDATED 2025-06-20 by Martin Pulec: rebased against 45a30e036 + fix compile
create mode 100644 libavcodec/libsvt_hevc.c
diff --git a/configure b/configure
index 077b87af..5dcc49ca 100755
index e1809a3e58..936cea82ab 100755
--- a/configure
+++ b/configure
@@ -339,6 +339,7 @@ External library support:
--enable-vapoursynth enable VapourSynth demuxer [no]
--enable-whisper enable whisper filter [no]
--disable-xlib disable xlib [autodetect]
--disable-zlib disable zlib [autodetect]
+ --enable-libsvthevc enable HEVC encoding via svt [no]
The following libraries provide various hardware acceleration features:
--disable-amf disable AMF video encoding code [autodetect]
@@ -1981,6 +1982,7 @@ EXTERNAL_LIBRARY_LIST="
@@ -1979,6 +1980,7 @@ EXTERNAL_LIBRARY_LIST="
libsrt
libssh
libsvtav1
@@ -40,7 +40,7 @@ index 077b87af..5dcc49ca 100755
libtensorflow
libtesseract
libtheora
@@ -3655,6 +3657,7 @@ vapoursynth_demuxer_deps="vapoursynth"
@@ -3678,6 +3680,7 @@ vapoursynth_demuxer_deps="vapoursynth"
videotoolbox_suggest="coreservices"
videotoolbox_deps="corefoundation coremedia corevideo VTDecompressionSessionDecodeFrame"
videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
@@ -48,19 +48,19 @@ index 077b87af..5dcc49ca 100755
# demuxers / muxers
ac3_demuxer_select="ac3_parser"
@@ -7094,6 +7097,7 @@ enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/
@@ -7149,6 +7152,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
+enabled libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
enabled libsvtvp9 && require_pkg_config libsvtvp9 SvtVp9Enc EbSvtVp9Enc.h eb_vp9_svt_init_handle
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 805b0a07..49c644ca 100644
index 35408949ac..12f534a1d7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1188,6 +1188,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim
@@ -1202,6 +1202,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
@@ -69,10 +69,10 @@ index 805b0a07..49c644ca 100644
OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o
OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index fef337ca..8e67e0df 100644
index f5ec2e01e8..7844040a00 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -826,6 +826,7 @@ extern const FFCodec ff_libxavs_encoder;
@@ -827,6 +827,7 @@ extern const FFCodec ff_libxavs_encoder;
extern const FFCodec ff_libxavs2_encoder;
extern const FFCodec ff_libxvid_encoder;
extern const FFCodec ff_libzvbi_teletext_decoder;
@@ -82,7 +82,7 @@ index fef337ca..8e67e0df 100644
extern const FFCodec ff_bintext_decoder;
diff --git a/libavcodec/libsvt_hevc.c b/libavcodec/libsvt_hevc.c
new file mode 100644
index 00000000..07f62fa7
index 0000000000..07f62fa762
--- /dev/null
+++ b/libavcodec/libsvt_hevc.c
@@ -0,0 +1,584 @@
@@ -671,5 +671,5 @@ index 00000000..07f62fa7
+ .p.wrapper_name = "libsvt_hevc",
+};
--
2.50.0
2.50.1