mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux2: Wait for playlist load after a switch

Browse source 
Check in update_fragment_info() if the playlist we want has actually been loaded
yet, and return BUSY if not.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Jan Schmidt 2022-12-31 00:51:02 +11:00 committed by GStreamer Marge Bot
parent 2b93dae59a
commit 91c8f3f990
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux-stream.c
View file

@ -1568,7 +1568,7 @@ gst_hls_demux_stream_check_current_playlist_uri (GstHLSDemuxStream * stream,
gst_hls_demux_stream_get_playlist_loader (stream); gst_hls_demux_stream_get_playlist_loader (stream);
if (!gst_hls_demux_playlist_loader_has_current_uri (pl, uri)) { if (!gst_hls_demux_playlist_loader_has_current_uri (pl, uri)) {
GST_LOG_OBJECT (stream, "Playlist '%s' not available yet", uri); GST_LOG_OBJECT (stream, "Target playlist not available yet");
return GST_ADAPTIVE_DEMUX_FLOW_BUSY; return GST_ADAPTIVE_DEMUX_FLOW_BUSY;
} }
@ -1596,11 +1596,23 @@ gst_hls_demux_stream_update_fragment_info (GstAdaptiveDemux2Stream * stream)
GstM3U8PartialSegment *part = NULL; GstM3U8PartialSegment *part = NULL;
gboolean discont; gboolean discont;
/* Return BUSY if the playlist isn't loaded yet */ /* Return BUSY if no playlist is loaded yet. Even if
* we switched an another playlist is loading, we'll keep*/
if (!hlsdemux_stream->playlist_fetched) { if (!hlsdemux_stream->playlist_fetched) {
gst_hls_demux_stream_start_playlist_loading (hlsdemux_stream); gst_hls_demux_stream_start_playlist_loading (hlsdemux_stream);
return GST_ADAPTIVE_DEMUX_FLOW_BUSY; return GST_ADAPTIVE_DEMUX_FLOW_BUSY;
} }
g_assert (hlsdemux_stream->playlist != NULL);
if ((ret =
gst_hls_demux_stream_check_current_playlist_uri (hlsdemux_stream,
NULL)) != GST_FLOW_OK) {
/* The URI of the playlist we have is not the target URI due
* to a bitrate switch - wait for it to load */
GST_DEBUG_OBJECT (hlsdemux_stream,
"Playlist is stale. Waiting for new playlist");
gst_hls_demux_stream_start_playlist_loading (hlsdemux_stream);
return ret;
}
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
GstClockTimeDiff live_edge_dist = GstClockTimeDiff live_edge_dist =
GST_CLOCK_TIME_IS_VALID (stream->current_position) ? GST_CLOCK_TIME_IS_VALID (stream->current_position) ?