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

Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81' 

* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
  hls: Respect the different stream time bases when comparing dts

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-29 14:18:37 +02:00
parent 2f9e97b32a 9d64f23629
commit 65dcb54493
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/hls.c
View File

@ -705,21 +705,27 @@ start:
/* 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->cur_seq_no < c->variants[minvariant]->cur_seq_no) {
struct variant *minvar = c->variants[minvariant];
if (minvariant < 0 || var->cur_seq_no < minvar->cur_seq_no) {
minvariant = i;
} else if (var->cur_seq_no == c->variants[minvariant]->cur_seq_no) {
struct variant *minvar = c->variants[minvariant];
int64_t dts = var->pkt.dts;
int64_t mindts = minvar->pkt.dts;
AVStream *st = var->ctx->streams[ var->pkt.stream_index];
AVStream *minst= minvar->ctx->streams[minvar->pkt.stream_index];
} else if (var->cur_seq_no == minvar->cur_seq_no) {
int64_t dts = var->pkt.dts;
int64_t mindts = minvar->pkt.dts;
AVStream *st = var->ctx->streams[var->pkt.stream_index];
AVStream *minst = minvar->ctx->streams[minvar->pkt.stream_index];
if( st->start_time != AV_NOPTS_VALUE) dts -= st->start_time;
if(minst->start_time != AV_NOPTS_VALUE) mindts -= minst->start_time;
if (av_compare_ts(dts, st->time_base, mindts, minst->time_base) < 0)
if (dts == AV_NOPTS_VALUE) {
minvariant = i;
} else if (mindts != AV_NOPTS_VALUE) {
if (st->start_time != AV_NOPTS_VALUE)
dts -= st->start_time;
if (minst->start_time != AV_NOPTS_VALUE)
mindts -= minst->start_time;
if (av_compare_ts(dts, st->time_base,
mindts, minst->time_base) < 0)
minvariant = i;
}
}
}
}