summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_divtc.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_divtc.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_divtc.c')
-rw-r--r--libmpcodecs/vf_divtc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index d632a4c60d..b3d84d200f 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -45,6 +45,7 @@ struct vf_priv_s
char *bdata;
unsigned int *csdata;
int *history;
+ struct vf_detc_pts_buf ptsbuf;
};
/*
@@ -358,6 +359,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
{
case 0:
imgop(copyop, dmpi, mpi, 0);
+ vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 1);
return 0;
case 4:
@@ -372,12 +374,12 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
imgop(copyop, tmpi, mpi, 0);
imgop(deghost_plane, tmpi, dmpi, p->deghost);
imgop(copyop, dmpi, mpi, 0);
- return vf_next_put_image(vf, tmpi, MP_NOPTS_VALUE);
+ return vf_next_put_image(vf, tmpi, vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 0));
}
}
imgop(copyop, dmpi, mpi, 0);
- return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
+ return vf_next_put_image(vf, dmpi, vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 0));
}
static int analyze(struct vf_priv_s *p)
@@ -706,6 +708,7 @@ static int vf_open(vf_instance_t *vf, char *args)
#endif
free(args);
+ vf_detc_init_pts_buf(&p->ptsbuf);
return 1;
}