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

gst/playback/gstplaybasebin.c: Fix unplayable files error handling. Fixes #158365

Browse source 
Original commit message from CVS:
patch by: Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybasebin.c:
Fix unplayable files error handling.  Fixes #158365
This commit is contained in:
Ronald Bultje 2004-11-23 16:52:15 +00:00 committed by Thomas Vander Stichele
parent d0be35ce38
commit 28d19a542d
2 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-23 Thomas Vander Stichele <thomas at apestaart dot org>
patch by: Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybasebin.c:
Fix unplayable files error handling. Fixes #158365
2004-11-23 Thomas Vander Stichele <thomas at apestaart dot org> 2004-11-23 Thomas Vander Stichele <thomas at apestaart dot org>
patch by: Ronald Bultje <rbultje@ronald.bitfreak.net> patch by: Ronald Bultje <rbultje@ronald.bitfreak.net>

47
gst/playback/gstplaybasebin.c
View file

@ -309,35 +309,40 @@ group_destroy (GstPlayBaseGroup * group)
* and ready for playback * and ready for playback
*/ */
static void static void
group_commit (GstPlayBaseBin * play_base_bin) group_commit (GstPlayBaseBin * play_base_bin, gboolean fatal)
{ {
GstPlayBaseGroup *group = play_base_bin->building_group; GstPlayBaseGroup *group = play_base_bin->building_group;
GList *prerolls; GList *prerolls;
/* if an element signalled a no-more-pads after we stopped due /* if an element signalled a no-more-pads after we stopped due
* to preroll, the group is NULL. This is not an error */ * to preroll, the group is NULL. This is not an error */
if (group == NULL) if (group == NULL) {
return; if (!fatal) {
return;
} else {
GST_DEBUG ("Group loading failed, bailing out");
}
} else {
GST_DEBUG ("group %p done", group);
GST_DEBUG ("group %p done", group); play_base_bin->queued_groups = g_list_append (play_base_bin->queued_groups,
group);
play_base_bin->queued_groups = g_list_append (play_base_bin->queued_groups, play_base_bin->building_group = NULL;
group);
play_base_bin->building_group = NULL; /* remove signals. We don't want anymore signals from the preroll
* elements at this stage. */
for (prerolls = group->preroll_elems; prerolls;
prerolls = g_list_next (prerolls)) {
GstElement *element = GST_ELEMENT (prerolls->data);
guint sig_id;
/* remove signals. We don't want anymore signals from the preroll sig_id =
* elements at this stage. */ GPOINTER_TO_INT (g_object_get_data (G_OBJECT (element), "signal_id"));
for (prerolls = group->preroll_elems; prerolls;
prerolls = g_list_next (prerolls)) {
GstElement *element = GST_ELEMENT (prerolls->data);
guint sig_id;
sig_id = GST_LOG ("removing preroll signal %s", gst_element_get_name (element));
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (element), "signal_id")); g_signal_handler_disconnect (G_OBJECT (element), sig_id);
}
GST_LOG ("removing preroll signal %s", gst_element_get_name (element));
g_signal_handler_disconnect (G_OBJECT (element), sig_id);
} }
g_mutex_lock (play_base_bin->group_lock); g_mutex_lock (play_base_bin->group_lock);
@ -370,7 +375,7 @@ static void
queue_overrun (GstElement * element, GstPlayBaseBin * play_base_bin) queue_overrun (GstElement * element, GstPlayBaseBin * play_base_bin)
{ {
GST_DEBUG ("queue %s overrun", gst_element_get_name (element)); GST_DEBUG ("queue %s overrun", gst_element_get_name (element));
group_commit (play_base_bin); group_commit (play_base_bin, FALSE);
} }
/* generate a preroll element which is simply a queue. While there /* generate a preroll element which is simply a queue. While there
@ -499,7 +504,7 @@ no_more_pads (GstElement * element, GstPlayBaseBin * play_base_bin)
/* setup phase */ /* setup phase */
GST_DEBUG ("no more pads"); GST_DEBUG ("no more pads");
/* we can commit this group for playback now */ /* we can commit this group for playback now */
group_commit (play_base_bin); group_commit (play_base_bin, FALSE);
} }
static gboolean static gboolean
@ -750,7 +755,7 @@ state_change (GstElement * element,
if (old_state > new_state) { if (old_state > new_state) {
/* EOS or error occurred, we have to commit the current group */ /* EOS or error occurred, we have to commit the current group */
GST_DEBUG ("state changed downwards"); GST_DEBUG ("state changed downwards");
group_commit (play_base_bin); group_commit (play_base_bin, TRUE);
} }
} }