RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hls: Return all packets from a previous variant before moving on to the next one 

This serves as a safeguard; normally we want to use the dts
comparison to interleave packets from all active variants. If that
dts comparison for some reason doesn't work as intended, make sure
that all packets in all variants for a certain sequence number have
been returned before moving on to the next one.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-07-28 20:09:31 +03:00
parent c5b46a064d
commit eb33ba04e0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/hls.c
View File

@ -638,10 +638,13 @@ start:
}
}
}
/* Check if this stream has the packet with the lowest dts */
/* Check if this stream still is on an earlier segment number, or
* has the packet with the lowest dts */
if (var->pkt.data) {
if (minvariant < 0 ||
var->pkt.dts < c->variants[minvariant]->pkt.dts)
var->cur_seq_no < c->variants[minvariant]->cur_seq_no ||
(var->cur_seq_no == c->variants[minvariant]->cur_seq_no &&
var->pkt.dts < c->variants[minvariant]->pkt.dts))
minvariant = i;
}
}