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

adaptivedemux: fix segment start when exposing new streams

Browse source 
Segment start needs only to be updated when starting the streams
or after a seek, doing it during bitrate changes will cause the
running time to go discontinuous (jump back to a previous ts)
and QOS will drop buffers
This commit is contained in:
Thiago Santos 2014-12-23 01:48:41 -03:00
parent 73fb0850c9
commit 0bef1974e2
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,8 @@ static void gst_adaptive_demux_updates_loop (GstAdaptiveDemux * demux);
static void gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * static void gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream *
stream); stream);
static void gst_adaptive_demux_reset (GstAdaptiveDemux * demux); static void gst_adaptive_demux_reset (GstAdaptiveDemux * demux);
static gboolean gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux); static gboolean gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux,
gboolean first_segment);
static gboolean gst_adaptive_demux_is_live (GstAdaptiveDemux * demux); static gboolean gst_adaptive_demux_is_live (GstAdaptiveDemux * demux);
static GstFlowReturn gst_adaptive_demux_stream_seek (GstAdaptiveDemux * demux, static GstFlowReturn gst_adaptive_demux_stream_seek (GstAdaptiveDemux * demux,
GstAdaptiveDemuxStream * stream, GstClockTime ts); GstAdaptiveDemuxStream * stream, GstClockTime ts);
@ -403,7 +404,7 @@ gst_adaptive_demux_sink_event (GstPad * pad, GstObject * parent,
} }
if (demux->next_streams) { if (demux->next_streams) {
gst_adaptive_demux_expose_streams (demux); gst_adaptive_demux_expose_streams (demux, TRUE);
gst_adaptive_demux_start_tasks (demux); gst_adaptive_demux_start_tasks (demux);
if (gst_adaptive_demux_is_live (demux)) { if (gst_adaptive_demux_is_live (demux)) {
/* Task to periodically update the manifest */ /* Task to periodically update the manifest */
@ -613,7 +614,8 @@ gst_adaptive_demux_expose_stream (GstAdaptiveDemux * demux,
} }
static gboolean static gboolean
gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux) gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux,
gboolean first_segment)
{ {
GList *iter; GList *iter;
GList *old_streams; GList *old_streams;
@ -634,17 +636,20 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux)
/* TODO act on error */ /* TODO act on error */
} }
/* TODO we only need the first timestamp, maybe create a simple function */ if (first_segment) {
gst_adaptive_demux_stream_update_fragment_info (demux, stream); /* TODO we only need the first timestamp, maybe create a simple function */
gst_adaptive_demux_stream_update_fragment_info (demux, stream);
if (GST_CLOCK_TIME_IS_VALID (min_pts)) { if (GST_CLOCK_TIME_IS_VALID (min_pts)) {
min_pts = MIN (min_pts, stream->fragment.timestamp); min_pts = MIN (min_pts, stream->fragment.timestamp);
} else { } else {
min_pts = stream->fragment.timestamp; min_pts = stream->fragment.timestamp;
}
} }
} }
demux->segment.start = demux->segment.position = min_pts; if (first_segment)
demux->segment.start = demux->segment.position = min_pts;
for (iter = demux->streams; iter; iter = g_list_next (iter)) { for (iter = demux->streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data; GstAdaptiveDemuxStream *stream = iter->data;
@ -869,7 +874,7 @@ gst_adaptive_demux_src_event (GstPad * pad, GstObject * parent,
gst_adaptive_demux_push_src_event (demux, fevent); gst_adaptive_demux_push_src_event (demux, fevent);
} }
if (demux->next_streams) { if (demux->next_streams) {
gst_adaptive_demux_expose_streams (demux); gst_adaptive_demux_expose_streams (demux, TRUE);
} }
/* Restart the demux */ /* Restart the demux */
@ -1872,7 +1877,7 @@ gst_adaptive_demux_stream_download_loop (GstAdaptiveDemuxStream * stream)
/* TODO only allow switching streams if other downloads are not ongoing */ /* TODO only allow switching streams if other downloads are not ongoing */
GST_DEBUG_OBJECT (demux, "Subclass wants new pads " GST_DEBUG_OBJECT (demux, "Subclass wants new pads "
"to do bitrate switching"); "to do bitrate switching");
gst_adaptive_demux_expose_streams (demux); gst_adaptive_demux_expose_streams (demux, FALSE);
gst_adaptive_demux_start_tasks (demux); gst_adaptive_demux_start_tasks (demux);
ret = GST_FLOW_EOS; ret = GST_FLOW_EOS;
GST_MANIFEST_UNLOCK (demux); GST_MANIFEST_UNLOCK (demux);
@ -2299,7 +2304,7 @@ gst_adaptive_demux_advance_period (GstAdaptiveDemux * demux)
GST_DEBUG_OBJECT (demux, "Advancing to next period"); GST_DEBUG_OBJECT (demux, "Advancing to next period");
klass->advance_period (demux); klass->advance_period (demux);
gst_adaptive_demux_expose_streams (demux); gst_adaptive_demux_expose_streams (demux, TRUE);
gst_adaptive_demux_start_tasks (demux); gst_adaptive_demux_start_tasks (demux);
} }