1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 17:12:36 +00:00

Estimate pts of additional frame generated by tfields also if correct-pts is

not set, even if it is not very relevant currently.
Based on patch by John Lindgren [john lindgren tds net]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30485 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-02-01 22:22:32 +00:00
parent 2aa41effad
commit 22087004b8

View File

@ -336,6 +336,12 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
return continue_buffered_image(vf);
}
static double calc_pts(double base_pts, int field)
{
// FIXME this assumes 25 fps / 50 fields per second
return base_pts + 0.02 * field;
}
static int continue_buffered_image(struct vf_instance_s *vf)
{
int i=vf->priv->buffered_i;
@ -349,7 +355,6 @@ static int continue_buffered_image(struct vf_instance_s *vf)
if (i == 0)
vf_queue_frame(vf, continue_buffered_image);
pts += i * .02; // XXX not right
if (!(mpi->flags & MP_IMGFLAG_PLANAR)) bpp = mpi->bpp/8;
if (vf->priv->parity < 0) {
@ -387,7 +392,7 @@ static int continue_buffered_image(struct vf_instance_s *vf)
dmpi->stride[1] = 2*mpi->stride[1];
dmpi->stride[2] = 2*mpi->stride[2];
}
ret |= vf_next_put_image(vf, dmpi, pts);
ret |= vf_next_put_image(vf, dmpi, calc_pts(pts, i));
if (correct_pts)
break;
else
@ -417,7 +422,7 @@ static int continue_buffered_image(struct vf_instance_s *vf)
deint(dmpi->planes[2], dmpi->stride[2], mpi->planes[2], mpi->stride[2],
mpi->chroma_width, mpi->chroma_height, (i^!tff));
}
ret |= vf_next_put_image(vf, dmpi, pts);
ret |= vf_next_put_image(vf, dmpi, calc_pts(pts, i));
if (correct_pts)
break;
else
@ -443,7 +448,7 @@ static int continue_buffered_image(struct vf_instance_s *vf)
mpi->chroma_width, mpi->chroma_height/2,
dmpi->stride[2], mpi->stride[2]*2, (i^!tff));
}
ret |= vf_next_put_image(vf, dmpi, pts);
ret |= vf_next_put_image(vf, dmpi, calc_pts(pts, i));
if (correct_pts)
break;
else