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

adaptivedemux: Fix startup SEGMENT seeking and setting for live

Browse source 
Because fragment.timestamp is relative value to period_start,
startup SEGMENT seeking should be pointed to "fragment.timestamp + period_start"

https://bugzilla.gnome.org/show_bug.cgi?id=774196
This commit is contained in:
Seungha Yang 2016-11-10 23:07:50 +09:00 committed by Sebastian Dröge
parent dcc7ab25f3
commit e2dbc2affa
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -989,6 +989,8 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux,
}
}
period_start = gst_adaptive_demux_get_period_start_time (demux);
/* For live streams, the subclass is supposed to seek to the current
* fragment and then tell us its timestamp in stream->fragment.timestamp.
* We now also have to seek our demuxer segment to reflect this.
@ -997,12 +999,10 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux,
*/
if (first_and_live) {
gst_segment_do_seek (&demux->segment, demux->segment.rate, GST_FORMAT_TIME,
GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, min_pts, GST_SEEK_TYPE_NONE, -1,
NULL);
GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, min_pts + period_start,
GST_SEEK_TYPE_NONE, -1, NULL);
}
period_start = gst_adaptive_demux_get_period_start_time (demux);
for (iter = demux->streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data;
GstClockTime offset;
@ -1059,7 +1059,13 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux,
* equivalent.
*/
if (demux->segment.start > period_start) {
/* If first and live, demuxer did seek to the current position already */
if (first_and_live) {
stream->segment.start = demux->segment.start - period_start + offset;
stream->segment.position = stream->segment.start;
stream->segment.time = demux->segment.time;
stream->segment.base = demux->segment.base;
} else if (demux->segment.start > period_start) {
stream->segment.start = demux->segment.start - period_start + offset;
stream->segment.position = offset;
stream->segment.time = demux->segment.time;