RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

dvd, bd: fix A/V sync

Browse Source 
Slightly less robust, but simpler, and usually guarantees that audio
and video are properly in sync.
This commit is contained in:
wm4 2014-07-18 01:08:43 +02:00
parent 1d7a68d75c
commit 34fdf082d8
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
demux/demux_disc.c
View File

@ -16,6 +16,7 @@
*/ */
#include <string.h> #include <string.h>
#include <math.h>
#include <assert.h> #include <assert.h>
#include "common/common.h" #include "common/common.h"
@ -37,15 +38,18 @@ struct priv {
// might add the streams only later. // might add the streams only later.
struct sh_stream *dvd_subs[32]; struct sh_stream *dvd_subs[32];
// Used to rewrite the raw MPEG timestamps to playback time. // Used to rewrite the raw MPEG timestamps to playback time.
struct {
double base_time; // playback display start time of current segment double base_time; // playback display start time of current segment
double base_dts; // packet DTS that maps to base_time double base_dts; // packet DTS that maps to base_time
double last_dts; // DTS of previously demuxed packet double last_dts; // DTS of previously demuxed packet
} pts[STREAM_TYPE_COUNT];
double seek_pts; double seek_pts;
bool seek_reinit; // needs reinit after seek bool seek_reinit; // needs reinit after seek
}; };
// If the timestamp difference between subsequent packets is this big, assume
// a reset. It should be big enough to account for 1. low video framerates and
// large audio frames, and 2. bad interleaving.
#define DTS_RESET_THRESHOLD 5.0
static void reselect_streams(demuxer_t *demuxer) static void reselect_streams(demuxer_t *demuxer)
{ {
struct priv *p = demuxer->priv; struct priv *p = demuxer->priv;
@ -189,11 +193,8 @@ static void reset_pts(demuxer_t *demuxer)
MP_VERBOSE(demuxer, "reset to time: %f\n", base); MP_VERBOSE(demuxer, "reset to time: %f\n", base);
for (int n = 0; n < STREAM_TYPE_COUNT; n++) { p->base_dts = p->last_dts = MP_NOPTS_VALUE;
p->pts[n].base_dts = p->pts[n].last_dts = MP_NOPTS_VALUE; p->base_time = base;
p->pts[n].base_time = base;
}
p->seek_reinit = false; p->seek_reinit = false;
} }
@ -222,32 +223,30 @@ static int d_fill_buffer(demuxer_t *demuxer)
return 1; return 1;
} }
int t = sh->type;
// Subtitle timestamps are not continuous, so the heuristic below can't be
// applied. Instead, use the video stream as reference.
if (t == STREAM_SUB)
t = STREAM_VIDEO;
MP_TRACE(demuxer, "ipts: %d %f %f\n", sh->type, pkt->pts, pkt->dts); MP_TRACE(demuxer, "ipts: %d %f %f\n", sh->type, pkt->pts, pkt->dts);
if (sh->type == STREAM_SUB) { if (sh->type == STREAM_SUB) {
if (p->pts[t].base_dts == MP_NOPTS_VALUE) if (p->base_dts == MP_NOPTS_VALUE)
MP_WARN(demuxer, "subtitle packet along PTS reset, report a bug\n"); MP_WARN(demuxer, "subtitle packet along PTS reset\n");
} else if (pkt->dts != MP_NOPTS_VALUE) { } else if (pkt->dts != MP_NOPTS_VALUE) {
if (p->pts[t].base_dts == MP_NOPTS_VALUE) // Use the very first DTS to rebase the start time of the MPEG stream
p->pts[t].base_dts = p->pts[t].last_dts = pkt->dts; // to the playback time.
if (p->base_dts == MP_NOPTS_VALUE)
p->base_dts = pkt->dts;
if (pkt->dts < p->pts[t].last_dts || pkt->dts > p->pts[t].last_dts + 0.5) if (p->last_dts == MP_NOPTS_VALUE)
{ p->last_dts = pkt->dts;
MP_VERBOSE(demuxer, "PTS discontinuity on stream %d\n", sh->type);
p->pts[t].base_time += p->pts[t].last_dts - p->pts[t].base_dts; if (fabs(p->last_dts - pkt->dts) >= DTS_RESET_THRESHOLD) {
p->pts[t].base_dts = p->pts[t].last_dts = pkt->dts - pkt->duration; MP_WARN(demuxer, "PTS discontinuity: %f->%f\n", p->last_dts, pkt->dts);
p->base_time += p->last_dts - p->base_dts;
p->base_dts = pkt->dts - pkt->duration;
} }
p->pts[t].last_dts = pkt->dts; p->last_dts = pkt->dts;
} }
if (p->pts[t].base_dts != MP_NOPTS_VALUE) {
double delta = -p->pts[t].base_dts + p->pts[t].base_time; if (p->base_dts != MP_NOPTS_VALUE) {
double delta = -p->base_dts + p->base_time;
if (pkt->pts != MP_NOPTS_VALUE) if (pkt->pts != MP_NOPTS_VALUE)
pkt->pts += delta; pkt->pts += delta;
if (pkt->dts != MP_NOPTS_VALUE) if (pkt->dts != MP_NOPTS_VALUE)