RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-14 02:51:26 +00:00
Code Issues Releases Wiki Activity

player: change semantics of --no-correct-pts

Browse Source 
Before this commit, this mode estimated the frame time by subtracting
successive packet PTS values. This is complete non-sense for video
codecs which use reordering. The code compensated frame times for these
non-sense using the FPS value, but confused the rest of the player with
non-sense jumping around timestamps. So, all in all this mode is not
very useful.

Repurpose this mode for fixed frame rate playback. This gives almost the
same behavior as the old mode with forced framerate (--fps option). The
result is simpler and often more robust.
This commit is contained in:
wm4 2013-11-25 23:10:18 +01:00
parent 83dc3a81f1
commit 88fa420b20
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mpvcore/player/video.c
View File

@ -269,37 +269,19 @@ static int check_framedrop(struct MPContext *mpctx, double frame_time)
static struct demux_packet *video_read_frame(struct MPContext *mpctx)
{
struct dec_video *d_video = mpctx->d_video;
demuxer_t *demuxer = d_video->header->demuxer;
float pts1 = d_video->last_pts;
double frame_time = 1.0f / (d_video->fps > 0 ? d_video->fps : 25);
struct demux_packet *pkt = demux_read_packet(d_video->header);
if (!pkt)
return NULL; // EOF
if (pkt->pts != MP_NOPTS_VALUE)
d_video->last_pts = pkt->pts;
float frame_time = d_video->fps > 0 ? 1.0f / d_video->fps : 0;
// override frame_time for variable/unknown FPS formats:
if (!mpctx->opts->force_fps) {
double next_pts = demux_get_next_pts(d_video->header);
double d = next_pts == MP_NOPTS_VALUE ? d_video->last_pts - pts1
: next_pts - d_video->last_pts;
if (d >= 0) {
if (demuxer->type == DEMUXER_TYPE_TV) {
if (d > 0)
d_video->fps = 1.0f / d;
frame_time = d;
} else {
if ((int)d_video->fps <= 1)
frame_time = d;
}
}
if (d_video->last_pts == MP_NOPTS_VALUE) {
d_video->last_pts = pkt->pts == MP_NOPTS_VALUE ? 0 : pkt->pts;
d_video->pts = d_video->last_pts;
}
d_video->pts = d_video->last_pts;
d_video->next_frame_time = frame_time;
double prev = d_video->pts;
d_video->pts = d_video->pts + frame_time;
d_video->last_pts = prev;
return pkt;
}
@ -311,7 +293,7 @@ static double update_video_nocorrect_pts(struct MPContext *mpctx)
// In nocorrect-pts mode there is no way to properly time these frames
if (load_next_vo_frame(mpctx, false))
break;
frame_time = d_video->next_frame_time;
frame_time = d_video->pts - d_video->last_pts;
if (mpctx->restart_playback)
frame_time = 0;
struct demux_packet *pkt = video_read_frame(mpctx);

1
video/decode/dec_video.h
View File

@ -59,7 +59,6 @@ struct dec_video {
float initial_decoder_aspect;
// State used only by player/video.c
float next_frame_time;
double last_pts;
};