mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: Don't try to add pads when shutting down

Browse source 
Be even more agressive than before and just hold the DYN lock when/if
adding pads and return if we are shutting down.
This commit is contained in:
Edward Hervey 2017-11-14 13:38:42 +01:00 committed by Edward Hervey
parent 77e5a71a15
commit ce8f51e30e
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/playback/gstdecodebin2.c
View file

@ -4697,6 +4697,14 @@ retry:
/* re-order pads : video, then audio, then others */
endpads = g_list_sort (endpads, (GCompareFunc) sort_end_pads);
/* Don't add pads if we are shutting down */
DYN_LOCK (dbin);
if (G_UNLIKELY (dbin->shutdown)) {
GST_WARNING_OBJECT (dbin, "Currently, shutting down, aborting exposing");
DYN_UNLOCK (dbin);
return FALSE;
}
/* Expose pads */
for (tmp = endpads; tmp; tmp = tmp->next) {
GstDecodePad *dpad = (GstDecodePad *) tmp->data;
@ -4727,6 +4735,7 @@ retry:
/* 3. emit signal */
GST_INFO_OBJECT (dpad, "added new decoded pad");
}
DYN_UNLOCK (dbin);
/* 4. Signal no-more-pads. This allows the application to hook stuff to the
* exposed pads */