mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 05:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux2: Download new header when it changes

Browse source 
Check whether the init file / MAP data for a segment
is different to the current data and trigger an
update if so. Previously, the header would only
be checked in HLS after switching bitrate or
after a seek / first download.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3307>
This commit is contained in:
Jan Schmidt 2022-11-01 02:17:46 +11:00 committed by Tim-Philipp Müller
parent 9b8c71d148
commit 6af3769511
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1741,6 +1741,11 @@ gst_hls_demux_stream_finalize (GObject * object)
hls_stream->playlist = NULL;
}
if (hls_stream->init_file) {
gst_m3u8_init_file_unref (hls_stream->init_file);
hls_stream->init_file = NULL;
}
if (hls_stream->pending_encrypted_data)
g_object_unref (hls_stream->pending_encrypted_data);
@ -2387,7 +2392,20 @@ gst_hls_demux_update_fragment_info (GstAdaptiveDemux2Stream * stream)
discont = file->discont || stream->discont;
if (GST_ADAPTIVE_DEMUX2_STREAM_NEED_HEADER (stream) && file->init_file) {
gboolean need_header = GST_ADAPTIVE_DEMUX2_STREAM_NEED_HEADER (stream);
/* Check if the MAP header file changed and update it */
if (file->init_file != NULL
&& !gst_m3u8_init_file_equal (hlsdemux_stream->init_file,
file->init_file)) {
GST_DEBUG_OBJECT (stream, "MAP header info changed. Updating");
if (hlsdemux_stream->init_file != NULL)
gst_m3u8_init_file_unref (hlsdemux_stream->init_file);
hlsdemux_stream->init_file = gst_m3u8_init_file_ref (file->init_file);
need_header = TRUE;
}
if (file->init_file && need_header) {
GstM3U8InitFile *header_file = file->init_file;
g_free (stream->fragment.header_uri);
stream->fragment.header_uri = g_strdup (header_file->uri);
@ -2398,6 +2416,8 @@ gst_hls_demux_update_fragment_info (GstAdaptiveDemux2Stream * stream)
} else {
stream->fragment.header_range_end = -1;
}
stream->need_header = TRUE;
}
/* set up our source for download */

3
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux.h
View file

@ -110,6 +110,9 @@ struct _GstHLSDemuxStream
/* The media playlist currently used */
GstHLSMediaPlaylist *playlist;
/* The current header / init_file data */
GstM3U8InitFile *init_file;
/* The segment (from the above playlist) currently being used */
GstM3U8MediaSegment *current_segment;