mirror of
https://github.com/mpv-player/mpv
synced 2024-08-24 07:21:49 +02:00
demux_lavf: always set packet duration
Makes WebVTT actually work. Also simplify the logic for setting duration. Only the subtitle path uses the packet duration, so the checks for STREAM_SUB as well as the keyframe flag are redundant. Apparently duration and convergence_duration are the same thing, but convergence_duration was added as Matroska-specific hack to get a higher value range (int vs. int64_t) with high resolution Matroska timebases. For us it doesn't matter, because double floats are used for timestamps and durations.
This commit is contained in:
parent
b11bd1fe5e
commit
6dbedd27d5
@ -671,11 +671,8 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds)
|
||||
if (ts != AV_NOPTS_VALUE) {
|
||||
dp->pts = ts * av_q2d(st->time_base);
|
||||
priv->last_pts = dp->pts * AV_TIME_BASE;
|
||||
// always set duration for subtitles, even if AV_PKT_FLAG_KEY isn't set,
|
||||
// otherwise they will stay on screen to long if e.g. ASS is demuxed
|
||||
// from mkv
|
||||
if ((stream->type == STREAM_SUB || (pkt->flags & AV_PKT_FLAG_KEY)) &&
|
||||
pkt->convergence_duration > 0)
|
||||
dp->duration = pkt->duration * av_q2d(st->time_base);
|
||||
if (pkt->convergence_duration > 0)
|
||||
dp->duration = pkt->convergence_duration * av_q2d(st->time_base);
|
||||
}
|
||||
dp->pos = demux->filepos;
|
||||
|
Loading…
Reference in New Issue
Block a user