mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpdparser: clamp segment durations to each other and period end

Browse source 
5.3.2.1 in the spec.

https://bugzilla.gnome.org/show_bug.cgi?id=751792
This commit is contained in:
Vincent Penquerc'h 2016-04-01 14:36:15 +01:00
parent 7d8cc26c91
commit 8ac261841c
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ext/dash/gstmpdparser.c
View file

@ -4054,18 +4054,47 @@ gst_mpd_client_setup_representation (GstMpdClient * client,
} }
} }
/* check duration of last segment */ /* clip duration of segments to stop at period end */
last_media_segment = (stream->segments && stream->segments->len) ? if (stream->segments && stream->segments->len) {
g_ptr_array_index (stream->segments, stream->segments->len - 1) : NULL; if (GST_CLOCK_TIME_IS_VALID (PeriodEnd)) {
for (guint n = 0; n < stream->segments->len; ++n) {
GstMediaSegment *media_segment =
g_ptr_array_index (stream->segments, n);
if (media_segment) {
if (media_segment->start + media_segment->duration >
PeriodEnd - PeriodStart) {
GstClockTime stop = PeriodEnd - PeriodStart;
if (n < stream->segments->len - 1) {
GstMediaSegment *next_segment =
g_ptr_array_index (stream->segments, n + 1);
if (next_segment && next_segment->start < PeriodEnd - PeriodStart)
stop = next_segment->start;
}
media_segment->duration =
media_segment->start > stop ? 0 : stop - media_segment->start;
GST_LOG ("Fixed duration of segment %u: %" GST_TIME_FORMAT, n,
GST_TIME_ARGS (media_segment->duration));
if (last_media_segment && GST_CLOCK_TIME_IS_VALID (PeriodEnd)) { /* If the segment was clipped entirely, we discard it and all
if (last_media_segment->start + last_media_segment->duration > PeriodEnd) { * subsequent ones */
last_media_segment->duration = if (media_segment->duration == 0) {
PeriodEnd - PeriodStart - last_media_segment->start; GST_WARNING ("Discarding %u segments outside period",
GST_LOG ("Fixed duration of last segment: %" GST_TIME_FORMAT, stream->segments->len - n);
GST_TIME_ARGS (last_media_segment->duration)); /* _set_size should properly unref elements */
g_ptr_array_set_size (stream->segments, n);
break;
}
}
}
}
}
if (stream->segments->len > 0) {
last_media_segment =
g_ptr_array_index (stream->segments, stream->segments->len - 1);
GST_LOG ("Built a list of %d segments", last_media_segment->number);
} else {
GST_LOG ("All media segments were clipped");
} }
GST_LOG ("Built a list of %d segments", last_media_segment->number);
} }
g_free (stream->baseURL); g_free (stream->baseURL);