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

decodebin: Simplify adaptive streaming demuxer code a bit

Browse source
This commit is contained in:
Sebastian Dröge 2014-03-06 22:28:46 +01:00
parent a9d98c57a4
commit 274b4eb870
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/playback/gstdecodebin2.c
View file

@ -416,6 +416,7 @@ struct _GstDecodeChain
gboolean drained; /* TRUE if the all children are drained */ gboolean drained; /* TRUE if the all children are drained */
gboolean demuxer; /* TRUE if elements->data is a demuxer */ gboolean demuxer; /* TRUE if elements->data is a demuxer */
gboolean adaptive_demuxer; /* TRUE if elements->data is an adaptive streaming demuxer */
gboolean seekable; /* TRUE if this chain ends on a demuxer and is seekable */ gboolean seekable; /* TRUE if this chain ends on a demuxer and is seekable */
GList *elements; /* All elements in this group, first GList *elements; /* All elements in this group, first
is the latest and most downstream element */ is the latest and most downstream element */
@ -2120,6 +2121,7 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
delem->capsfilter = NULL; delem->capsfilter = NULL;
chain->elements = g_list_prepend (chain->elements, delem); chain->elements = g_list_prepend (chain->elements, delem);
chain->demuxer = is_demuxer_element (element); chain->demuxer = is_demuxer_element (element);
chain->adaptive_demuxer = is_adaptive_demuxer_element (element);
/* For adaptive streaming demuxer we insert a multiqueue after /* For adaptive streaming demuxer we insert a multiqueue after
* this demuxer. This multiqueue will get one fragment per buffer. * this demuxer. This multiqueue will get one fragment per buffer.
@ -2135,12 +2137,8 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstDecodePad * dpad,
*/ */
if (chain->parent && chain->parent->parent) { if (chain->parent && chain->parent->parent) {
GstDecodeChain *parent_chain = chain->parent->parent; GstDecodeChain *parent_chain = chain->parent->parent;
GstDecodeElement *parent_last_element;
parent_last_element = if (parent_chain->adaptive_demuxer)
parent_chain->elements ? parent_chain->elements->data : NULL;
if (parent_last_element
&& is_adaptive_demuxer_element (parent_last_element->element))
chain->demuxer = TRUE; chain->demuxer = TRUE;
} }