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

dashdemux: fix multiple period mpd playback

Browse source 
Make dash playlists with multiple periods work again by waiting
to switch the periods when all streams have reached the end of
the current period. The stream_loop is responsible for advancing
the period, but the download loops will already start downloading
data for the next period as soon as possible.
This commit is contained in:
Thiago Santos 2013-12-09 11:28:25 -03:00
parent 1483b59c6b
commit a2583e54d1
1 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
ext/dash/gstdashdemux.c
View file

@ -691,12 +691,37 @@ gst_dash_demux_setup_mpdparser_streams (GstDashDemux * demux,
return has_streams;
}
static gboolean
gst_dash_demux_all_streams_eop (GstDashDemux * demux)
{
GSList *iter = NULL;
GST_DEBUG_OBJECT (demux, "Checking if all streams are EOP");
for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream = iter->data;
GST_LOG_OBJECT (stream->pad, "EOP: %d (linked: %d)",
stream->download_end_of_period,
stream->last_ret != GST_FLOW_NOT_LINKED);
if (!stream->download_end_of_period
&& stream->last_ret != GST_FLOW_NOT_LINKED)
return FALSE;
}
return TRUE;
}
static gboolean
gst_dash_demux_setup_all_streams (GstDashDemux * demux)
{
guint i;
GSList *streams = NULL;
GST_DEBUG_OBJECT (demux, "Setting up streams for period %d",
gst_mpd_client_get_period_index (demux->client));
GST_MPD_CLIENT_LOCK (demux->client);
/* clean old active stream list, if any */
gst_active_streams_free (demux->client);
@ -1346,6 +1371,7 @@ gst_dash_demux_stream_loop (GstDashDemux * demux)
goto end_of_manifest;
} else if (eop) {
gst_dash_demux_advance_period (demux);
demux->need_segment = TRUE;
}
}
@ -1749,24 +1775,33 @@ gst_dash_demux_stream_download_loop (GstDashDemuxStream * stream)
case GST_FLOW_OK:
break;
case GST_FLOW_EOS:
g_mutex_lock (&demux->streams_lock);
GST_DASH_DEMUX_STREAM_DOWNLOAD_LOCK (stream);
if (demux->end_of_period) {
if (gst_dash_demux_all_streams_eop (demux)) {
GST_INFO_OBJECT (stream->pad, "Reached the end of the Period");
/* setup video, audio and subtitle streams, starting from the next Period */
if (!gst_mpd_client_set_period_index (demux->client,
gst_mpd_client_get_period_index (demux->client) + 1)
|| !gst_dash_demux_setup_all_streams (demux)) {
if (gst_mpd_client_has_next_period (demux->client)) {
/* setup video, audio and subtitle streams, starting from the next Period */
if (!gst_mpd_client_set_period_index (demux->client,
gst_mpd_client_get_period_index (demux->client) + 1)
|| !gst_dash_demux_setup_all_streams (demux)) {
}
/* start playing from the first segment of the new period */
gst_mpd_client_set_segment_index_for_all_streams (demux->client, 0);
demux->end_of_period = FALSE;
gst_task_start (demux->stream_task);
} else if (!demux->end_of_manifest) {
GST_INFO_OBJECT (stream->pad, "Reached the end of the manifest file");
demux->end_of_manifest = TRUE;
gst_task_start (demux->stream_task);
GST_DASH_DEMUX_STREAM_DOWNLOAD_UNLOCK (stream);
g_mutex_unlock (&demux->streams_lock);
goto end_of_manifest;
}
/* start playing from the first segment of the new period */
gst_mpd_client_set_segment_index_for_all_streams (demux->client, 0);
demux->end_of_period = FALSE;
}
gst_task_pause (stream->download_task);
GST_DASH_DEMUX_STREAM_DOWNLOAD_UNLOCK (stream);
g_mutex_unlock (&demux->streams_lock);
break;
case GST_FLOW_ERROR:
/* Download failed 'by itself'