MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hls: fix min DTS code, try #2

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-21 01:48:04 +02:00
parent bf606334ad
commit 3ac754b93b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/hls.c
View File

@ -646,11 +646,21 @@ start:
}
/* Check if this stream has the packet with the lowest dts */
if (var->pkt.data) {
struct variant *minvar = c->variants[minvariant];
if (minvariant < 0 ||
av_compare_ts(var->pkt.dts, var->ctx->streams[var->pkt.stream_index]->time_base,
minvar->pkt.dts, minvar->ctx->streams[minvar->pkt.stream_index]->time_base) > 0)
if(minvariant < 0) {
minvariant = i;
} else {
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];
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;
}
}
}
if (c->end_of_segment) {