mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: unlock stream if caps update fails

Browse source 
If caps update fail a dead lock occurs since the stream mutex is not
unlocked.
This commit is contained in:
Víctor Manuel Jáquez Leal 2020-03-05 13:26:38 +01:00
parent bf2299279f
commit 6e65356017
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/vaapi/gstvaapidecode.c
View file

@ -472,17 +472,23 @@ gst_vaapidecode_negotiate (GstVaapiDecode * decode)
GST_VIDEO_DECODER_STREAM_LOCK (vdec); GST_VIDEO_DECODER_STREAM_LOCK (vdec);
if (!gst_vaapi_plugin_base_set_caps (plugin, decode->sinkpad_caps, NULL)) if (!gst_vaapi_plugin_base_set_caps (plugin, decode->sinkpad_caps, NULL))
return FALSE; goto caps_negotiation_failed;
if (!gst_vaapidecode_update_src_caps (decode)) if (!gst_vaapidecode_update_src_caps (decode))
return FALSE; goto caps_negotiation_failed;
if (!gst_vaapi_plugin_base_set_caps (plugin, NULL, decode->srcpad_caps)) if (!gst_vaapi_plugin_base_set_caps (plugin, NULL, decode->srcpad_caps))
return FALSE; goto caps_negotiation_failed;
GST_VIDEO_DECODER_STREAM_UNLOCK (vdec); GST_VIDEO_DECODER_STREAM_UNLOCK (vdec);
if (!gst_video_decoder_negotiate (vdec)) if (!gst_video_decoder_negotiate (vdec))
return FALSE; return FALSE;
return TRUE; return TRUE;
caps_negotiation_failed:
{
GST_VIDEO_DECODER_STREAM_UNLOCK (vdec);
return FALSE;
}
} }
static gboolean static gboolean