mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux2: Handle all cases for starting segment calculation

Browse source 
The implementation wouldn't work with regular HLS streams (i.e. the final
fallback).

Now that the implementation uses time to search for the starting
segment (instead of just the n-th from the end), we can specify the correct
hold_back fallback value from the RFC

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Edward Hervey 2023-01-04 11:17:42 +01:00 committed by GStreamer Marge Bot
parent 3129970c8a
commit 1c6364673d
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/m3u8.c
View file

@ -2060,11 +2060,11 @@ gst_hls_media_playlist_sync_to_segment (GstHLSMediaPlaylist * playlist,
gboolean
gst_hls_media_playlist_get_starting_segment (GstHLSMediaPlaylist * self,
gboolean low_latency, GstM3U8SeekResult * seek_result)
gboolean allow_low_latency, GstM3U8SeekResult * seek_result)
{
GstM3U8MediaSegment *res = NULL;
GST_DEBUG ("playlist %s", self->uri);
GST_DEBUG ("allow_low_latency:%d playlist %s", allow_low_latency, self->uri);
if (!GST_HLS_MEDIA_PLAYLIST_IS_LIVE (self)) {
/* For non-live, we just grab the first one */
@ -2072,18 +2072,29 @@ gst_hls_media_playlist_get_starting_segment (GstHLSMediaPlaylist * self,
} else {
GstClockTime hold_back = GST_CLOCK_TIME_NONE;
/* Live playlist. If low-latency, use the PART-HOLD-BACK specified distance
* from the end, otherwise HOLD-BACK distance or if that's not provided,
* then 3 target durations */
if (low_latency) {
* from the end, otherwise HOLD-BACK distance */
if (allow_low_latency) {
if (GST_CLOCK_TIME_IS_VALID (self->part_hold_back))
hold_back = self->part_hold_back;
else if (GST_CLOCK_TIME_IS_VALID (self->partial_targetduration))
hold_back = 3 * self->partial_targetduration;
} else {
if (GST_CLOCK_TIME_IS_VALID (self->hold_back))
else if (GST_CLOCK_TIME_IS_VALID (self->hold_back))
hold_back = self->hold_back;
else if (GST_CLOCK_TIME_IS_VALID (self->targetduration))
hold_back = 3 * self->targetduration;
}
if (hold_back == GST_CLOCK_TIME_NONE) {
/* If low-latency is not enabled, or none of the above were present,
* fallback to the standard behaviour:
*
* RFC 8216 6.3.3. Playing the Media Playlist File:
*
* The client SHALL choose which Media Segment to play first from the
* Media Playlist when playback starts. If the EXT-X-ENDLIST tag is not
* present and the client intends to play the media normally, the client
* SHOULD NOT choose a segment that starts less than three target
* durations from the end of the Playlist file. Doing so can trigger
* playback stalls.
*/
hold_back = GST_M3U8_LIVE_MIN_FRAGMENT_DISTANCE * self->targetduration;
}
if (GST_CLOCK_TIME_IS_VALID (hold_back)) {
@ -2104,7 +2115,7 @@ gst_hls_media_playlist_get_starting_segment (GstHLSMediaPlaylist * self,
" Looking for a segment before %" GST_TIME_FORMAT,
GST_TIME_ARGS (hold_back), GST_TIME_ARGS (target_ts));
if (low_latency)
if (allow_low_latency)
flags |= GST_HLS_M3U8_SEEK_FLAG_ALLOW_PARTIAL;
if (gst_hls_media_playlist_seek (self, TRUE, flags, target_ts,