diff options
| author | Rudolf Polzer <divverent@alientrap.org> | 2011-04-23 18:56:47 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-04-24 03:55:47 +0300 |
| commit | 994b21a80a2f37b0d672526739cb742b87f33ad9 (patch) | |
| tree | 222e014be69723c4772d5045fee35eb98ffc8a63 /libmpcodecs/vf_ivtc.c | |
| parent | 28b3cc0efe7a575cb8004d1b109ce5ca2f2953bb (diff) | |
| download | mpv-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_ivtc.c')
| -rw-r--r-- | libmpcodecs/vf_ivtc.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c index 5622ee03b8..966292ff14 100644 --- a/libmpcodecs/vf_ivtc.c +++ b/libmpcodecs/vf_ivtc.c @@ -49,6 +49,7 @@ struct vf_priv_s { int first; int drop, lastdrop, dropnext; int inframes, outframes; + struct vf_detc_pts_buf ptsbuf; }; enum { @@ -426,7 +427,7 @@ static void copy_image(mp_image_t *dmpi, mp_image_t *mpi, int field) } } -static int do_put_image(struct vf_instance *vf, mp_image_t *dmpi) +static int do_put_image(struct vf_instance *vf, mp_image_t *dmpi, double pts) { struct vf_priv_s *p = vf->priv; int dropflag=0; @@ -448,11 +449,12 @@ static int do_put_image(struct vf_instance *vf, mp_image_t *dmpi) // p->outframes, p->inframes, (float)p->outframes/p->inframes); mp_msg(MSGT_VFILTER, MSGL_V, "!"); p->lastdrop = 0; + vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 1); return 0; } p->outframes++; - 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 put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) @@ -464,6 +466,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) if (p->first) { /* hack */ p->first = 0; + vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 1); return 1; } @@ -482,22 +485,23 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) ret = 0; p->lastdrop = 0; mp_msg(MSGT_VFILTER, MSGL_V, "DROP\n"); + vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 1); break; case F_MERGE: copy_image(p->dmpi, mpi, 0); - ret = do_put_image(vf, p->dmpi); + ret = do_put_image(vf, p->dmpi, pts); copy_image(p->dmpi, mpi, 1); mp_msg(MSGT_VFILTER, MSGL_V, "MERGE\n"); p->dmpi = NULL; break; case F_NEXT: copy_image(p->dmpi, mpi, 2); - ret = do_put_image(vf, p->dmpi); + ret = do_put_image(vf, p->dmpi, pts); mp_msg(MSGT_VFILTER, MSGL_V, "NEXT\n"); p->dmpi = NULL; break; case F_SHOW: - ret = do_put_image(vf, p->dmpi); + ret = do_put_image(vf, p->dmpi, pts); copy_image(p->dmpi, mpi, 2); mp_msg(MSGT_VFILTER, MSGL_V, "OK\n"); p->dmpi = NULL; @@ -537,6 +541,7 @@ static int vf_open(vf_instance_t *vf, char *args) #if HAVE_MMX && HAVE_EBX_AVAILABLE if(gCpuCaps.hasMMX) block_diffs = block_diffs_MMX; #endif + vf_detc_init_pts_buf(&p->ptsbuf); return 1; } |