mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: always set presentationTimeOffset

Browse source 
Set it for all types of segment lists (templates / lists / base)
and not only for templates.

https://bugzilla.gnome.org/show_bug.cgi?id=751529
This commit is contained in:
Thiago Santos 2015-11-20 20:59:16 -03:00
parent 8541424d34
commit 5be46607bb
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ext/dash/gstmpdparser.c
View file

@ -3819,6 +3819,34 @@ gst_mpd_client_add_media_segment (GstActiveStream * stream,
return TRUE; return TRUE;
} }
static void
gst_mpd_client_stream_update_presentation_time_offset (GstMpdClient * client,
GstActiveStream * stream)
{
GstSegmentBaseType *segbase = NULL;
/* Find the used segbase */
if (stream->cur_segment_list) {
segbase = stream->cur_segment_list->MultSegBaseType->SegBaseType;
} else if (stream->cur_seg_template) {
segbase = stream->cur_seg_template->MultSegBaseType->SegBaseType;
} else if (stream->cur_segment_base) {
segbase = stream->cur_segment_base;
}
if (segbase) {
/* Avoid overflows */
stream->presentationTimeOffset =
gst_util_uint64_scale (segbase->presentationTimeOffset, GST_SECOND,
segbase->timescale);
} else {
stream->presentationTimeOffset = 0;
}
GST_LOG ("Setting stream's presentation time offset to %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->presentationTimeOffset));
}
gboolean gboolean
gst_mpd_client_setup_representation (GstMpdClient * client, gst_mpd_client_setup_representation (GstMpdClient * client,
GstActiveStream * stream, GstRepresentationNode * representation) GstActiveStream * stream, GstRepresentationNode * representation)
@ -3984,13 +4012,6 @@ gst_mpd_client_setup_representation (GstMpdClient * client,
GST_LOG ("Building media segment list using this template: %s", GST_LOG ("Building media segment list using this template: %s",
stream->cur_seg_template->media); stream->cur_seg_template->media);
/* Avoid overflows */
stream->presentationTimeOffset =
gst_util_uint64_scale (mult_seg->SegBaseType->presentationTimeOffset,
GST_SECOND, mult_seg->SegBaseType->timescale);
GST_LOG ("Setting stream's presentation time offset to %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->presentationTimeOffset));
if (mult_seg->SegmentTimeline) { if (mult_seg->SegmentTimeline) {
GstSegmentTimelineNode *timeline; GstSegmentTimelineNode *timeline;
GstSNode *S; GstSNode *S;
@ -4046,6 +4067,8 @@ gst_mpd_client_setup_representation (GstMpdClient * client,
stream->baseURL = stream->baseURL =
gst_mpdparser_parse_baseURL (client, stream, &stream->queryURL); gst_mpdparser_parse_baseURL (client, stream, &stream->queryURL);
gst_mpd_client_stream_update_presentation_time_offset (client, stream);
return TRUE; return TRUE;
} }