mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-16 21:36:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

x265: Fix a deadlock when failing to create the x265enc.

Browse source 
The GST_ELEMENT_ERROR will call the gst_object_get_path_string and
use gst_object_get_parent to get the full object path name, which
needs to lock the object. But we are already in a locked context and
so this will cause a deadlock, the pipeline can not exit normally.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2451>
This commit is contained in:
He Junyan 2021-08-04 15:02:01 +08:00 committed by GStreamer Marge Bot
parent 34c81d13b6
commit c5fda68403
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/x265/gstx265enc.c
View file

@ -986,8 +986,7 @@ gst_x265_enc_init_encoder_locked (GstX265Enc * encoder)
encoder->x265enc = encoder->api->encoder_open (&encoder->x265param); encoder->x265enc = encoder->api->encoder_open (&encoder->x265param);
if (!encoder->x265enc) { if (!encoder->x265enc) {
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, GST_ERROR_OBJECT (encoder, "Can not open x265 encoder.");
("Can not initialize x265 encoder."), (NULL));
return FALSE; return FALSE;
} }
@ -1012,6 +1011,10 @@ gst_x265_enc_init_encoder (GstX265Enc * encoder)
result = gst_x265_enc_init_encoder_locked (encoder); result = gst_x265_enc_init_encoder_locked (encoder);
GST_OBJECT_UNLOCK (encoder); GST_OBJECT_UNLOCK (encoder);
if (!result)
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE,
("Can not initialize x265 encoder."), (NULL));
return result; return result;
} }