RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
wm4 2013-06-01 19:54:34 +02:00
parent b11bd1fe5e
commit 6dbedd27d5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demux/demux_lavf.c
View File

@ -671,11 +671,8 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds)
if (ts != AV_NOPTS_VALUE) { if (ts != AV_NOPTS_VALUE) {
dp->pts = ts * av_q2d(st->time_base); dp->pts = ts * av_q2d(st->time_base);
priv->last_pts = dp->pts * AV_TIME_BASE; priv->last_pts = dp->pts * AV_TIME_BASE;
// always set duration for subtitles, even if AV_PKT_FLAG_KEY isn't set, dp->duration = pkt->duration * av_q2d(st->time_base);
// otherwise they will stay on screen to long if e.g. ASS is demuxed if (pkt->convergence_duration > 0)
// from mkv
if ((stream->type == STREAM_SUB || (pkt->flags & AV_PKT_FLAG_KEY)) &&
pkt->convergence_duration > 0)
dp->duration = pkt->convergence_duration * av_q2d(st->time_base); dp->duration = pkt->convergence_duration * av_q2d(st->time_base);
} }
dp->pos = demux->filepos; dp->pos = demux->filepos;