Commit dd5f9259 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 704cc5e7
...@@ -874,11 +874,12 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in ...@@ -874,11 +874,12 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in
st->pts_wrap_reference == AV_NOPTS_VALUE && st->first_dts != AV_NOPTS_VALUE) { st->pts_wrap_reference == AV_NOPTS_VALUE && st->first_dts != AV_NOPTS_VALUE) {
int i; int i;
int64_t ref = st->first_dts & ((1LL<<st->pts_wrap_bits)-1);
// reference time stamp should be 60 s before first time stamp // reference time stamp should be 60 s before first time stamp
int64_t pts_wrap_reference = st->first_dts - av_rescale(60, st->time_base.den, st->time_base.num); int64_t pts_wrap_reference = ref - av_rescale(60, st->time_base.den, st->time_base.num);
// if first time stamp is not more than 1/8 and 60s before the wrap point, subtract rather than add wrap offset // if first time stamp is not more than 1/8 and 60s before the wrap point, subtract rather than add wrap offset
int pts_wrap_behavior = (st->first_dts < (1LL<<st->pts_wrap_bits) - (1LL<<st->pts_wrap_bits-3)) || int pts_wrap_behavior = (ref < (1LL<<st->pts_wrap_bits) - (1LL<<st->pts_wrap_bits-3)) ||
(st->first_dts < (1LL<<st->pts_wrap_bits) - av_rescale(60, st->time_base.den, st->time_base.num)) ? (ref < (1LL<<st->pts_wrap_bits) - av_rescale(60, st->time_base.den, st->time_base.num)) ?
AV_PTS_WRAP_ADD_OFFSET : AV_PTS_WRAP_SUB_OFFSET; AV_PTS_WRAP_ADD_OFFSET : AV_PTS_WRAP_SUB_OFFSET;
AVProgram *first_program = av_find_program_from_stream(s, NULL, stream_index); AVProgram *first_program = av_find_program_from_stream(s, NULL, stream_index);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment