From 8090b1d8b295c5b1ce2f521a14972fc9a52452eeed5a0ccc1cdc98e8a634b83b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 30 Sep 2024 12:34:56 +0000 Subject: [PATCH] avcodec/decode: clean-up if get_hw_frames_parameters fails (ffmpeg#11013, vlc#28811) Signed-off-by: Olaf Hering --- ...lean-up-if-get_hw_frames_parameters-.patch | 27 +++++++++++++++++++ ffmpeg-7.changes | 7 +++++ ffmpeg-7.spec | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch diff --git a/11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch b/11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch new file mode 100644 index 0000000..90be345 --- /dev/null +++ b/11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch @@ -0,0 +1,27 @@ +From: François Cartegnie +Date: Mon, 13 May 2024 11:37:27 +0000 +Subject: avcodec/decode: clean-up if get_hw_frames_parameters fails + +https://trac.ffmpeg.org/ticket/11013 +https://code.videolan.org/videolan/vlc/-/issues/28811 + +Fixes the following assert: + +[00007f1df83d17e0] vaapi generic error: avcodec_get_hw_frames_parameters failed: -22 +Assertion p_dst->hwaccel_threadsafe || (!dst->hwaccel && !dst->internal->hwaccel_priv_data) failed at libavcodec/pthread_frame.c:349 + +Reproduced from VLC with VAAPI, when fallbacking from hw to sw. + +--- a/libavcodec/pthread_frame.c ++++ b/libavcodec/pthread_frame.c +@@ -344,6 +344,10 @@ FF_ENABLE_DEPRECATION_WARNINGS + return err; + } + ++ // hwaccel could have failed init due to some params ++ if(!dst->hwaccel && dst->internal->hwaccel_priv_data) ++ ff_hwaccel_uninit(dst); ++ + // reset dst hwaccel state if needed + av_assert0(p_dst->hwaccel_threadsafe || + (!dst->hwaccel && !dst->internal->hwaccel_priv_data)); diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index d704f35..6fcd818 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 30 12:34:56 UTC 2024 - olaf@aepfle.de + +- Fix assertion due to missing priv_data cleanup on failed VAAPI + acceleration with 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch + (ffmpeg#11013, vlc#28811) + ------------------------------------------------------------------- Thu Sep 26 10:02:20 UTC 2024 - Stefan Dirsch diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index 72111c5..cb91987 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -111,6 +111,7 @@ Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch95: ffmpeg-7-fix-crashes.patch Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel >= 3.98.3 @@ -825,6 +826,7 @@ Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch Patch95: ffmpeg-7-fix-crashes.patch Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs