Backport upstream patch to drop openh264 runtime version checks
... in order to make it possible for us to update openh264 without having to recompile ffmpeg against the new version every time. As openh264 is distributed by Cisco and ffmpeg is in Fedora, it's difficult to coordinate lock step updates. Drop the version check to make this easier. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211 This also rebases downstream ffmpeg-dlopen-openh264.patch on top of the new patch.
This commit is contained in:
Kalev Lember
parent
cc897ea5ca
commit
9f0ba814c4
|
|
@ -0,0 +1,109 @@
|
|||
From a641e629591d68bd3edd99bddec623dc31295f6b Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Wed, 6 Dec 2023 14:37:34 +0100
|
||||
Subject: [PATCH] lavc/libopenh264: Drop openh264 runtime version checks
|
||||
|
||||
Years ago, openh264 releases often changed their ABI without changing
|
||||
the library soname. To avoid running into ABI issues, a version check
|
||||
was added to lavc libopenh264 code to error out at runtime in case the
|
||||
build time and runtime openh264 versions don't match.
|
||||
|
||||
This should no longer be an issue with newer openh264 releases and we
|
||||
can drop the runtime version check and rely on upstream doing the right
|
||||
thing and bump the library soname if the ABI changes, similar to how
|
||||
other libraries are consumed in ffmpeg.
|
||||
|
||||
Almost all major distributions now include openh264 and this means there
|
||||
are more eyes on ABI changes and issues are discovered and reported
|
||||
quickly. See e.g. https://github.com/cisco/openh264/issues/3564 where an
|
||||
ABI issue was quickly discovered and fixed.
|
||||
|
||||
Relaxing the check allows downstream distributions to build ffmpeg
|
||||
against e.g. openh264 2.3.1 and ship an update to ABI-compatible
|
||||
openh264 2.4.0, without needing to coordinate a lock step update between
|
||||
ffmpeg and openh264 (which can be difficult if openh264 is distributed
|
||||
by Cisco and ffmpeg comes from the distro, such as is the case for
|
||||
Fedora).
|
||||
|
||||
Signed-off-by: Kalev Lember <klember@redhat.com>
|
||||
---
|
||||
libavcodec/libopenh264.c | 15 ---------------
|
||||
libavcodec/libopenh264.h | 2 --
|
||||
libavcodec/libopenh264dec.c | 4 ----
|
||||
libavcodec/libopenh264enc.c | 4 ----
|
||||
4 files changed, 25 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
|
||||
index 0f6d28ed88..c80c85ea8b 100644
|
||||
--- a/libavcodec/libopenh264.c
|
||||
+++ b/libavcodec/libopenh264.c
|
||||
@@ -46,18 +46,3 @@ void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg)
|
||||
int equiv_ffmpeg_log_level = libopenh264_to_ffmpeg_log_level(level);
|
||||
av_log(ctx, equiv_ffmpeg_log_level, "%s\n", msg);
|
||||
}
|
||||
-
|
||||
-int ff_libopenh264_check_version(void *logctx)
|
||||
-{
|
||||
- // Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
|
||||
- // function (for functions returning larger structs), thus skip the check in those
|
||||
- // configurations.
|
||||
-#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
|
||||
- OpenH264Version libver = WelsGetCodecVersion();
|
||||
- if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
|
||||
- av_log(logctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
|
||||
- return AVERROR(EINVAL);
|
||||
- }
|
||||
-#endif
|
||||
- return 0;
|
||||
-}
|
||||
diff --git a/libavcodec/libopenh264.h b/libavcodec/libopenh264.h
|
||||
index dbb9c5d429..0b462d6fdc 100644
|
||||
--- a/libavcodec/libopenh264.h
|
||||
+++ b/libavcodec/libopenh264.h
|
||||
@@ -34,6 +34,4 @@
|
||||
|
||||
void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg);
|
||||
|
||||
-int ff_libopenh264_check_version(void *logctx);
|
||||
-
|
||||
#endif /* AVCODEC_LIBOPENH264_H */
|
||||
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
|
||||
index 7d650ae03e..b6a9bba2dc 100644
|
||||
--- a/libavcodec/libopenh264dec.c
|
||||
+++ b/libavcodec/libopenh264dec.c
|
||||
@@ -52,13 +52,9 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
SVCContext *s = avctx->priv_data;
|
||||
SDecodingParam param = { 0 };
|
||||
- int err;
|
||||
int log_level;
|
||||
WelsTraceCallback callback_function;
|
||||
|
||||
- if ((err = ff_libopenh264_check_version(avctx)) < 0)
|
||||
- return AVERROR_DECODER_NOT_FOUND;
|
||||
-
|
||||
if (WelsCreateDecoder(&s->decoder)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
|
||||
return AVERROR_UNKNOWN;
|
||||
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
|
||||
index f518d0894e..6f231d22b2 100644
|
||||
--- a/libavcodec/libopenh264enc.c
|
||||
+++ b/libavcodec/libopenh264enc.c
|
||||
@@ -110,14 +110,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
|
||||
{
|
||||
SVCContext *s = avctx->priv_data;
|
||||
SEncParamExt param = { 0 };
|
||||
- int err;
|
||||
int log_level;
|
||||
WelsTraceCallback callback_function;
|
||||
AVCPBProperties *props;
|
||||
|
||||
- if ((err = ff_libopenh264_check_version(avctx)) < 0)
|
||||
- return AVERROR_ENCODER_NOT_FOUND;
|
||||
-
|
||||
if (WelsCreateSVCEncoder(&s->encoder)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
|
||||
return AVERROR_UNKNOWN;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4739b0c97b3378bdaf737171777fe9a71a53eff1 Mon Sep 17 00:00:00 2001
|
||||
From 1f48740db0dda8d6ec1b97a7f4a794e381a65636 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <ngompa@fedoraproject.org>
|
||||
Date: Wed, 12 Oct 2022 09:41:27 -0400
|
||||
Subject: [PATCH] avcodec/openh264: Add the ability to dlopen() OpenH264
|
||||
|
|
@ -14,12 +14,12 @@ Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
|
|||
---
|
||||
configure | 3 +
|
||||
libavcodec/Makefile | 1 +
|
||||
libavcodec/libopenh264.c | 18 +++-
|
||||
libavcodec/libopenh264.c | 5 ++
|
||||
libavcodec/libopenh264_dlopen.c | 147 ++++++++++++++++++++++++++++++++
|
||||
libavcodec/libopenh264_dlopen.h | 58 +++++++++++++
|
||||
libavcodec/libopenh264dec.c | 10 +++
|
||||
libavcodec/libopenh264enc.c | 10 +++
|
||||
7 files changed, 245 insertions(+), 2 deletions(-)
|
||||
7 files changed, 234 insertions(+)
|
||||
create mode 100644 libavcodec/libopenh264_dlopen.c
|
||||
create mode 100644 libavcodec/libopenh264_dlopen.h
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ index 457ec58377..08a26fba5f 100644
|
|||
OBJS-$(CONFIG_LIBOPENH264_ENCODER) += libopenh264enc.o libopenh264.o
|
||||
OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o
|
||||
diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
|
||||
index 0f6d28ed88..a124c3fa1e 100644
|
||||
index c80c85ea8b..128c3d9846 100644
|
||||
--- a/libavcodec/libopenh264.c
|
||||
+++ b/libavcodec/libopenh264.c
|
||||
@@ -20,8 +20,13 @@
|
||||
|
|
@ -81,26 +81,6 @@ index 0f6d28ed88..a124c3fa1e 100644
|
|||
|
||||
#include "libavutil/error.h"
|
||||
#include "libavutil/log.h"
|
||||
@@ -52,8 +57,17 @@ int ff_libopenh264_check_version(void *logctx)
|
||||
// Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
|
||||
// function (for functions returning larger structs), thus skip the check in those
|
||||
// configurations.
|
||||
-#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
|
||||
- OpenH264Version libver = WelsGetCodecVersion();
|
||||
+ // Also, for dlopened OpenH264, we should not do the version check. It's too punitive.
|
||||
+#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7) || !defined(CONFIG_LIBOPENH264_DLOPEN)
|
||||
+ OpenH264Version libver;
|
||||
+
|
||||
+#ifdef CONFIG_LIBOPENH264_DLOPEN
|
||||
+ if (loadLibOpenH264(logctx)) {
|
||||
+ return AVERROR_EXTERNAL;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ libver = WelsGetCodecVersion();
|
||||
if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
|
||||
av_log(logctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
|
||||
return AVERROR(EINVAL);
|
||||
diff --git a/libavcodec/libopenh264_dlopen.c b/libavcodec/libopenh264_dlopen.c
|
||||
new file mode 100644
|
||||
index 0000000000..49ea8ff44f
|
||||
|
|
@ -319,7 +299,7 @@ index 0000000000..d7d8bb7cad
|
|||
+
|
||||
+#endif /* HAVE_LIBOPENH264_DLOPEN_H */
|
||||
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
|
||||
index 007f86b619..57aa3bc1d1 100644
|
||||
index 7e14d4dd7d..a805598446 100644
|
||||
--- a/libavcodec/libopenh264dec.c
|
||||
+++ b/libavcodec/libopenh264dec.c
|
||||
@@ -19,8 +19,12 @@
|
||||
|
|
@ -335,7 +315,7 @@ index 007f86b619..57aa3bc1d1 100644
|
|||
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/fifo.h"
|
||||
@@ -56,6 +60,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
|
||||
@@ -55,6 +59,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
|
||||
int log_level;
|
||||
WelsTraceCallback callback_function;
|
||||
|
||||
|
|
@ -345,11 +325,11 @@ index 007f86b619..57aa3bc1d1 100644
|
|||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ((err = ff_libopenh264_check_version(avctx)) < 0)
|
||||
return AVERROR_DECODER_NOT_FOUND;
|
||||
|
||||
if (WelsCreateDecoder(&s->decoder)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
|
||||
return AVERROR_UNKNOWN;
|
||||
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
|
||||
index db252aace1..75289678da 100644
|
||||
index 5257906567..80481f3d0a 100644
|
||||
--- a/libavcodec/libopenh264enc.c
|
||||
+++ b/libavcodec/libopenh264enc.c
|
||||
@@ -19,8 +19,12 @@
|
||||
|
|
@ -365,7 +345,7 @@ index db252aace1..75289678da 100644
|
|||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/common.h"
|
||||
@@ -137,6 +141,12 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
|
||||
@@ -114,6 +118,12 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
|
||||
WelsTraceCallback callback_function;
|
||||
AVCPBProperties *props;
|
||||
|
||||
|
|
@ -375,9 +355,9 @@ index db252aace1..75289678da 100644
|
|||
+ }
|
||||
+#endif
|
||||
+
|
||||
if ((err = ff_libopenh264_check_version(avctx)) < 0)
|
||||
return AVERROR_ENCODER_NOT_FOUND;
|
||||
|
||||
if (WelsCreateSVCEncoder(&s->encoder)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
|
||||
return AVERROR_UNKNOWN;
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -136,6 +136,10 @@ Patch8: FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
|
|||
## Adapted from: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=9594
|
||||
Patch9: ffmpeg-ge-av1-vaapi-encode-support.patch
|
||||
|
||||
# Drop openh264 runtime version checks
|
||||
# https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211
|
||||
Patch10: 0001-lavc-libopenh264-Drop-openh264-runtime-version-check.patch
|
||||
|
||||
# Set up dlopen for openh264
|
||||
Patch1001: ffmpeg-dlopen-openh264.patch
|
||||
|
||||
|
|
@ -879,6 +883,7 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
|
|||
* Wed Dec 06 2023 Kalev Lember <klember@redhat.com> - 6.0.1-2
|
||||
- Build against noopenh264 stub headers and drop the bundled headers
|
||||
- Prefer openh264 over noopenh264
|
||||
- Backport upstream patch to drop openh264 runtime version checks
|
||||
|
||||
* Sat Nov 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0.1-1
|
||||
- Update to 6.0.1
|
||||
|
|
|
|||
Loading…
Reference in New Issue