summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_tile.c
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@alientrap.org>2011-04-23 18:56:47 +0200
committerUoti Urpala <uau@mplayer2.org>2011-04-24 03:55:47 +0300
commit994b21a80a2f37b0d672526739cb742b87f33ad9 (patch)
tree222e014be69723c4772d5045fee35eb98ffc8a63 /libmpcodecs/vf_tile.c
parent28b3cc0efe7a575cb8004d1b109ce5ca2f2953bb (diff)
downloadmpv-994b21a80a2f37b0d672526739cb742b87f33ad9.tar.bz2
mpv-994b21a80a2f37b0d672526739cb742b87f33ad9.tar.xz
vf_*: fix pts values passed to the next filter
Many video filters failed to calculate or even just pass through pts values for their output frames. Fix this, and also make the two remaining filters that called vf_next_put_image() twice for the same input frame (vf_softpulldown, vf_telecine) use vf_queue_frame() so that e.g. framestepping properly sees both frames. Changed filters: vf_bmovl, vf_detc, vf_divtc, vf_filmdint, vf_ivtc, vf_lavc, vf_phase, vf_pullup, vf_softpulldown, vf_telecine, vf_tile, vf_tinterlace.
Diffstat (limited to 'libmpcodecs/vf_tile.c')
-rw-r--r--libmpcodecs/vf_tile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c
index ad3d662875..0b5dac1559 100644
--- a/libmpcodecs/vf_tile.c
+++ b/libmpcodecs/vf_tile.c
@@ -80,6 +80,7 @@ struct vf_priv_s {
/* Work data */
int frame_cur;
+ double start_pts;
};
@@ -147,6 +148,8 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
// /* First frame, delete the background */
//
// }
+ if (t == 0)
+ priv->start_pts = pts;
/* Position of image */
xi = priv->start + (mpi->w + priv->delta) * (t % priv->xtile);
@@ -183,7 +186,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
/* Display the composition */
dmpi->width = xw;
dmpi->height = yh;
- return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
+ return vf_next_put_image(vf, dmpi, priv->start_pts);
}
else {
/* Skip the frame */