mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-10 13:51:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpdparser: support MPD files with SegmentBase elements encoded inside a SegmentList element

Browse source 
also properly support MPD files without any Initialization segment
This commit is contained in:
Gianluca Gennari 2012-10-09 13:24:23 +02:00 committed by Thiago Santos
parent 375634f669
commit b4057976be
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/dash/gstmpdparser.c
View file

@ -1760,13 +1760,29 @@ gst_mpdparser_get_segment_base (GstPeriodNode *Period,
{ {
GstSegmentBaseType *SegmentBase = NULL; GstSegmentBaseType *SegmentBase = NULL;
if (Representation && Representation->SegmentBase) { if (Representation && Representation->SegmentBase && Representation->SegmentBase->Initialization) {
SegmentBase = Representation->SegmentBase; SegmentBase = Representation->SegmentBase;
} else if (AdaptationSet) { } else if (AdaptationSet && AdaptationSet->SegmentBase && AdaptationSet->SegmentBase->Initialization) {
SegmentBase = AdaptationSet->SegmentBase; SegmentBase = AdaptationSet->SegmentBase;
} else { } else if (Period && Period->SegmentBase && Period->SegmentBase->Initialization) {
SegmentBase = Period->SegmentBase; SegmentBase = Period->SegmentBase;
} }
/* the SegmentBase element could be encoded also inside a SegmentList element */
if (SegmentBase == NULL) {
if (Representation && Representation->SegmentList && Representation->SegmentList->MultSegBaseType &&
Representation->SegmentList->MultSegBaseType->SegBaseType &&
Representation->SegmentList->MultSegBaseType->SegBaseType->Initialization) {
SegmentBase = Representation->SegmentList->MultSegBaseType->SegBaseType;
} else if (AdaptationSet && AdaptationSet->SegmentList && AdaptationSet->SegmentList->MultSegBaseType &&
AdaptationSet->SegmentList->MultSegBaseType->SegBaseType &&
AdaptationSet->SegmentList->MultSegBaseType->SegBaseType->Initialization) {
SegmentBase = AdaptationSet->SegmentList->MultSegBaseType->SegBaseType;
} else if (Period && Period->SegmentList && Period->SegmentList->MultSegBaseType &&
Period->SegmentList->MultSegBaseType->SegBaseType &&
Period->SegmentList->MultSegBaseType->SegBaseType->Initialization) {
SegmentBase = Period->SegmentList->MultSegBaseType->SegBaseType;
}
}
return SegmentBase; return SegmentBase;
} }
@ -1800,9 +1816,9 @@ gst_mpdparser_get_segment_list (GstPeriodNode *Period,
{ {
GstSegmentListNode *SegmentList = NULL; GstSegmentListNode *SegmentList = NULL;
if (Representation && Representation->SegmentBase) { if (Representation && Representation->SegmentList) {
SegmentList = Representation->SegmentList; SegmentList = Representation->SegmentList;
} else if (AdaptationSet) { } else if (AdaptationSet && AdaptationSet->SegmentList) {
SegmentList = AdaptationSet->SegmentList; SegmentList = AdaptationSet->SegmentList;
} else { } else {
SegmentList = Period->SegmentList; SegmentList = Period->SegmentList;
@ -2479,14 +2495,13 @@ gst_mpd_client_setup_representation (GstMpdClient * client, GstActiveStream *str
GST_LOG ("Building segment list for Period from %" GST_TIME_FORMAT " to %" GST_LOG ("Building segment list for Period from %" GST_TIME_FORMAT " to %"
GST_TIME_FORMAT, GST_TIME_ARGS (PeriodStart), GST_TIME_ARGS (PeriodEnd)); GST_TIME_FORMAT, GST_TIME_ARGS (PeriodStart), GST_TIME_ARGS (PeriodEnd));
if (representation->SegmentBase != NULL) { if (representation->SegmentBase != NULL || representation->SegmentList != NULL) {
GList *SegmentURL; GList *SegmentURL;
/* get the first segment_base of the selected representation */ /* get the first segment_base of the selected representation */
if ((stream->cur_segment_base = if ((stream->cur_segment_base =
gst_mpdparser_get_segment_base (client->cur_period, stream->cur_adapt_set, representation)) == NULL) { gst_mpdparser_get_segment_base (client->cur_period, stream->cur_adapt_set, representation)) == NULL) {
GST_WARNING ("No valid SegmentBase node in the MPD file, aborting..."); GST_WARNING ("No valid SegmentBase node in the MPD file");
return FALSE;
} }
/* get the first segment_list of the selected representation */ /* get the first segment_list of the selected representation */