jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps/media-playback: Fix AV_NOPTS_VALUE being used as timestamp 

With certain media files (wmv in particular), the very last frame will
have a timestamp of AV_NOPTS_VALUE.  This could cause the media to stick
on that frame indefinitely.  Instead, use the estimated next timestamp
that was calculated in the previous frame.
master
jp9000 2017-06-14 00:43:31 -07:00
parent c1cf44fd91
commit 3f5920ae5d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deps/media-playback/media-playback/decode.c vendored
View File

@ -320,9 +320,13 @@ bool mp_decode_next(struct mp_decode *d)
if (d->frame_ready) {
int64_t last_pts = d->frame_pts;
d->frame_pts = av_rescale_q(d->frame->best_effort_timestamp,
d->stream->time_base,
(AVRational){1, 1000000000});
if (d->frame->best_effort_timestamp == AV_NOPTS_VALUE)
d->frame_pts = d->next_pts;
else
d->frame_pts = av_rescale_q(
d->frame->best_effort_timestamp,
d->stream->time_base,
(AVRational){1, 1000000000});
int64_t duration = d->frame->pkt_duration;
if (!duration)
@ -331,6 +335,7 @@ bool mp_decode_next(struct mp_decode *d)
duration = av_rescale_q(duration,
d->stream->time_base,
(AVRational){1, 1000000000});
d->last_duration = duration;
d->next_pts = d->frame_pts + duration;
}