mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

openh264: Fail gracefully if openh264 encoder/decoder creation fails

Browse source 
This can happen with the dummy "noopenh264" library that the freedesktop
flatpak runtime ships, and Fedora is planning on shipping as well. In
both cases the dummy implementation gets replaced with the actual
openh264 library that's downloaded directly from Cisco, but just to be
on safe side, this patch makes it careful to check the return values to
avoid crashing if the underlying library hasn't been swapped out yet.

The patch is taken from freedesktop-sdk and was originally written by
Valentin David <valentin.david@codethink.co.uk>.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5586>
This commit is contained in:
Kalev Lember 2023-10-31 17:59:32 +01:00 committed by Tim-Philipp Müller
parent cb6955944f
commit f44f36482c
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-bad/ext/openh264/gstopenh264dec.cpp
View file

@ -159,7 +159,12 @@ gst_openh264dec_start (GstVideoDecoder * decoder)
WelsDestroyDecoder (openh264dec->decoder); WelsDestroyDecoder (openh264dec->decoder);
openh264dec->decoder = NULL; openh264dec->decoder = NULL;
} }
WelsCreateDecoder (&(openh264dec->decoder));
if (WelsCreateDecoder (&(openh264dec->decoder)) != 0) {
GST_ELEMENT_ERROR (openh264dec, LIBRARY, INIT, (NULL),
("Failed to create OpenH264 decoder."));
return FALSE;
}
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
{ {

8
subprojects/gst-plugins-bad/ext/openh264/gstopenh264enc.cpp
View file

@ -759,7 +759,13 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
WelsDestroySVCEncoder (openh264enc->encoder); WelsDestroySVCEncoder (openh264enc->encoder);
openh264enc->encoder = NULL; openh264enc->encoder = NULL;
} }
WelsCreateSVCEncoder (&openh264enc->encoder);
if (WelsCreateSVCEncoder (&openh264enc->encoder) != 0) {
GST_ELEMENT_ERROR (openh264enc, LIBRARY, INIT, (NULL),
("Failed to create OpenH264 encoder."));
return FALSE;
}
unsigned int uiTraceLevel = WELS_LOG_ERROR; unsigned int uiTraceLevel = WELS_LOG_ERROR;
openh264enc->encoder->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel); openh264enc->encoder->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);