RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

vo_opengl: correct OSD PTS when using interpolation

Browse Source
This commit is contained in:
Niklas Haas 2015-03-25 22:40:10 +01:00
parent 72308256e4
commit 62d3c95367
No known key found for this signature in database
GPG Key ID: 3BA77D4BFDB10BCE
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
video/out/gl_video.c
View File

@ -131,6 +131,7 @@ struct scaler {
struct fbosurface {
struct fbotex fbotex;
int64_t pts;
double vpts; // used for synchronizing subtitles only
};
#define FBOSURFACES_MAX 10
@ -492,8 +493,10 @@ void gl_video_set_debug(struct gl_video *p, bool enable)
static void gl_video_reset_surfaces(struct gl_video *p)
{
for (int i = 0; i < FBOSURFACES_MAX; i++)
for (int i = 0; i < FBOSURFACES_MAX; i++) {
p->surfaces[i].pts = 0;
p->surfaces[i].vpts = MP_NOPTS_VALUE;
}
p->surface_idx = 0;
p->surface_now = 0;
}
@ -1734,6 +1737,7 @@ static void gl_video_interpolate_frame(struct gl_video *p, int fbo,
finish_pass_fbo(p, &p->surfaces[p->surface_now].fbotex,
vp_w, vp_h, 0, fuzz);
p->surfaces[p->surface_now].pts = t ? t->pts : 0;
p->surfaces[p->surface_now].vpts = p->image.mpi->pts;
p->surface_idx = p->surface_now;
}
@ -1769,6 +1773,7 @@ static void gl_video_interpolate_frame(struct gl_video *p, int fbo,
finish_pass_fbo(p, &p->surfaces[surface_dst].fbotex,
vp_w, vp_h, 0, fuzz);
p->surfaces[surface_dst].pts = t->pts;
p->surfaces[surface_dst].vpts = p->image.mpi->pts;
p->surface_idx = surface_dst;
}
@ -1788,6 +1793,22 @@ static void gl_video_interpolate_frame(struct gl_video *p, int fbo,
}
}
// Update OSD PTS to synchronize subtitles with the displayed frame
if (t) {
double vpts_now = p->surfaces[surface_now].vpts,
vpts_nxt = p->surfaces[surface_nxt].vpts,
vpts_new = p->image.mpi->pts;
if (vpts_now != MP_NOPTS_VALUE &&
vpts_nxt != MP_NOPTS_VALUE &&
vpts_new != MP_NOPTS_VALUE)
{
// Round to nearest neighbour
double vpts_vsync = (t->next_vsync - t->pts)/1e6 + vpts_new;
p->osd_pts = fabs(vpts_vsync-vpts_now) < fabs(vpts_vsync-vpts_nxt)
? vpts_now : vpts_nxt;
}
}
// Finally, draw the right mix of frames to the screen.
if (!t || !valid) {
// surface_now is guaranteed to be valid, so we can safely use it.