mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

decodebin2: do not handle the next-groups list as if it was a single item

Browse source 
Decodebin2's chains store a next_groups list that was being handled as
it could only have a single element. This is true for most of the
chaining streams scenarios where streams change not very often.

In more stressfull changing scenarios, like adaptive streams, those
changes can happen very often, and in short time intervals. This could
confuse decodebin2 as this list was always being used as a single
element list.

This patches makes it handle as a real list, using iteration instead
of picking the first element as the correct one always.
This commit is contained in:
Thiago Santos 2013-02-06 11:09:52 -03:00
parent 054ffc6e2b
commit 6382d4c0ad
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/playback/gstdecodebin2.c
View file

@ -2573,7 +2573,12 @@ no_more_pads_cb (GstElement * element, GstDecodeChain * chain)
if (!chain->next_groups && chain->active_group) {
group = chain->active_group;
} else if (chain->next_groups) {
group = chain->next_groups->data;
GList *iter;
for (iter = chain->next_groups; iter; iter = g_list_next (iter)) {
group = iter->data;
if (!group->no_more_pads)
break;
}
}
if (!group) {
GST_ERROR_OBJECT (chain->dbin, "can't find group for element");
@ -2742,10 +2747,19 @@ gst_decode_chain_get_current_group (GstDecodeChain * chain)
} else if (!chain->active_group->overrun
&& !chain->active_group->no_more_pads) {
group = chain->active_group;
} else if (chain->next_groups && (group = chain->next_groups->data)
&& !group->overrun && !group->no_more_pads) {
/* group = chain->next_groups->data */
} else {
GList *iter;
group = NULL;
for (iter = chain->next_groups; iter; iter = g_list_next (iter)) {
GstDecodeGroup *next_group = iter->data;
if (!next_group->overrun && !next_group->no_more_pads) {
group = next_group;
break;
}
}
}
if (!group) {
group = gst_decode_group_new (chain->dbin, chain);
chain->next_groups = g_list_append (chain->next_groups, group);
}