x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-11 03:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/hls: advance first_timestamp once per live window slide

Browse Source 
Anchor c->first_timestamp to the playlist that established it and only let
that playlist's expiring segments advance it, so it slides exactly once
per window slide.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
This commit is contained in:
Kacper Michajłow
2026-06-23 20:40:28 +02:00
parent e27ad5760c
commit 50209cd0c0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/hls.c
+5 -1
View File
@@ -231,6 +231,7 @@ typedef struct HLSContext {
int prefer_x_start;
int first_packet;
int64_t first_timestamp;
struct playlist *first_timestamp_pls;
int64_t cur_timestamp;
AVIOInterruptCB *interrupt_callback;
AVDictionary *avio_opts;
@@ -1113,7 +1114,8 @@ static int parse_playlist(HLSContext *c, const char *url,
}
}
if (prev_segments) {
if (pls->start_seq_no > prev_start_seq_no && c->first_timestamp != AV_NOPTS_VALUE) {
if (pls->start_seq_no > prev_start_seq_no && c->first_timestamp != AV_NOPTS_VALUE &&
c->first_timestamp_pls == pls) {
int64_t prev_timestamp = c->first_timestamp;
int i;
int64_t diff = pls->start_seq_no - prev_start_seq_no;
@@ -2256,6 +2258,7 @@ static int hls_read_header(AVFormatContext *s)
c->first_packet = 1;
c->first_timestamp = AV_NOPTS_VALUE;
c->first_timestamp_pls = NULL;
c->cur_timestamp = AV_NOPTS_VALUE;
if ((ret = ffio_copy_url_options(s->pb, &c->avio_opts)) < 0)
@@ -2718,6 +2721,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
if (c->first_timestamp == AV_NOPTS_VALUE) {
c->first_timestamp = ts;
c->first_timestamp_pls = pls;
if (pls->type == PLS_TYPE_EVENT)
for (unsigned k = 0; k < s->nb_streams; k++) {