summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/vf.rst62
-rw-r--r--old-makefile1
-rw-r--r--video/filter/vf.c71
-rw-r--r--video/filter/vf.h12
-rw-r--r--video/filter/vf_divtc.c630
-rw-r--r--wscript_build.py1
6 files changed, 0 insertions, 777 deletions
diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index 78eb5d16a2..f4570ed183 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -406,68 +406,6 @@ Available filters are:
video. The main purpose of setting ``mp`` to a chroma plane is to reduce
CPU load and make pullup usable in realtime on slow machines.
-``divtc[=options]``
- Inverse telecine for deinterlaced video. If 3:2-pulldown telecined video
- has lost one of the fields or is deinterlaced using a method that keeps
- one field and interpolates the other, the result is a juddering video that
- has every fourth frame duplicated. This filter is intended to find and
- drop those duplicates and restore the original film framerate. Two
- different modes are available: One-pass mode is the default and is
- straightforward to use, but has the disadvantage that any changes in the
- telecine phase (lost frames or bad edits) cause momentary judder until the
- filter can resync again. Two-pass mode avoids this by analyzing the entire
- video beforehand so it will have forward knowledge about the phase changes
- and can resync at the exact spot. These passes do *not* correspond to pass
- one and two of the encoding process. You must run an extra pass using
- ``divtc`` pass one before the actual encoding throwing the resulting video
- away. Then use ``divtc`` pass two for the actual encoding. If you use
- multiple encoder passes, use ``divtc`` pass two for all of them.
-
- The options are:
-
- ``pass=1|2``
- Use two pass mode.
-
- ``file=<filename>``
- Set the two pass log filename (default: ``framediff.log``).
-
- ``threshold=<value>``
- Set the minimum strength the telecine pattern must have for the filter
- to believe in it (default: 0.5). This is used to avoid recognizing
- false pattern from the parts of the video that are very dark or very
- still.
-
- ``window=<numframes>``
- Set the number of past frames to look at when searching for pattern
- (default: 30). Longer window improves the reliability of the pattern
- search, but shorter window improves the reaction time to the changes
- in the telecine phase. This only affects the one-pass mode. The
- two-pass mode currently uses fixed window that extends to both future
- and past.
-
- ``phase=0|1|2|3|4``
- Sets the initial telecine phase for one pass mode (default: 0). The
- two-pass mode can see the future, so it is able to use the correct
- phase from the beginning, but one-pass mode can only guess. It catches
- the correct phase when it finds it, but this option can be used to fix
- the possible juddering at the beginning. The first pass of the two
- pass mode also uses this, so if you save the output from the first
- pass, you get constant phase result.
-
- ``deghost=<value>``
- Set the deghosting threshold (0-255 for one-pass mode, -255-255 for
- two-pass mode, default 0). If nonzero, deghosting mode is used. This
- is for video that has been deinterlaced by blending the fields
- together instead of dropping one of the fields. Deghosting amplifies
- any compression artifacts in the blended frames, so the parameter
- value is used as a threshold to exclude those pixels from deghosting
- that differ from the previous frame less than specified value. If two
- pass mode is used, then negative value can be used to make the filter
- analyze the whole video in the beginning of pass-2 to determine
- whether it needs deghosting or not and then select either zero or the
- absolute value of the parameter. Specify this option for pass 2, it
- makes no difference on pass 1.
-
``yadif=[mode[:enabled=yes|no]]``
Yet another deinterlacing filter
diff --git a/old-makefile b/old-makefile
index 1c3e523bf0..bcd2fd07b5 100644
--- a/old-makefile
+++ b/old-makefile
@@ -251,7 +251,6 @@ SOURCES = audio/audio.c \
video/filter/vf_buffer.c \
video/filter/vf_crop.c \
video/filter/vf_delogo.c \
- video/filter/vf_divtc.c \
video/filter/vf_dsize.c \
video/filter/vf_eq.c \
video/filter/vf_expand.c \
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 14ee694ac1..890c297cc0 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -58,7 +58,6 @@ extern const vf_info_t vf_info_ilpack;
extern const vf_info_t vf_info_dsize;
extern const vf_info_t vf_info_pullup;
extern const vf_info_t vf_info_delogo;
-extern const vf_info_t vf_info_divtc;
extern const vf_info_t vf_info_screenshot;
extern const vf_info_t vf_info_sub;
extern const vf_info_t vf_info_yadif;
@@ -97,7 +96,6 @@ static const vf_info_t *const filter_list[] = {
&vf_info_dsize,
&vf_info_pullup,
&vf_info_delogo,
- &vf_info_divtc,
&vf_info_sub,
&vf_info_yadif,
&vf_info_stereo3d,
@@ -756,72 +754,3 @@ void vf_set_dar(int *d_w, int *d_h, int w, int h, double dar)
}
}
}
-
-void vf_detc_init_pts_buf(struct vf_detc_pts_buf *p)
-{
- p->inpts_prev = MP_NOPTS_VALUE;
- p->outpts_prev = MP_NOPTS_VALUE;
- p->lastdelta = 0;
-}
-
-static double vf_detc_adjust_pts_internal(struct vf_detc_pts_buf *p,
- double pts, bool reset_pattern,
- bool skip_frame, double delta,
- double boundfactor_minus,
- double increasefactor,
- double boundfactor_plus)
-{
- double newpts;
-
- if (pts == MP_NOPTS_VALUE)
- return pts;
-
- if (delta <= 0) {
- if (p->inpts_prev == MP_NOPTS_VALUE)
- delta = 0;
- else if (pts == p->inpts_prev)
- delta = p->lastdelta;
- else
- delta = pts - p->inpts_prev;
- }
- p->inpts_prev = pts;
- p->lastdelta = delta;
-
- if (skip_frame)
- return MP_NOPTS_VALUE;
-
- /* detect bogus deltas and then passthru pts (possibly caused by seeking,
- * or bad input) */
- if (p->outpts_prev == MP_NOPTS_VALUE || reset_pattern || delta <= 0.0 ||
- delta >= 0.5)
- newpts = pts;
- else {
- // turn 5 frames into 4
- newpts = p->outpts_prev + delta * increasefactor;
-
- // bound to input pts in a sensible way; these numbers come because we
- // map frames the following way when ivtc'ing:
- // 0/30 -> 0/24 diff=0
- // 1/30 -> 1/24 diff=1/120
- // 2/30 -> -
- // 3/30 -> 2/24 diff=-1/60
- // 4/30 -> 3/24 diff=-1/120
- if (newpts < pts - delta * boundfactor_minus)
- newpts = pts - delta * boundfactor_minus;
- if (newpts > pts + delta * boundfactor_plus)
- newpts = pts + delta * boundfactor_plus;
- if (newpts < p->outpts_prev)
- newpts = p->outpts_prev; // damage control
- }
- p->outpts_prev = newpts;
-
- return newpts;
-}
-
-double vf_detc_adjust_pts(struct vf_detc_pts_buf *p, double pts,
- bool reset_pattern, bool skip_frame)
-{
- // standard telecine (see above)
- return vf_detc_adjust_pts_internal(p, pts, reset_pattern, skip_frame,
- 0, 0.5, 1.25, 0.25);
-}
diff --git a/video/filter/vf.h b/video/filter/vf.h
index e36632e019..b27f27e743 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -191,16 +191,4 @@ void vf_rescale_dsize(int *d_width, int *d_height, int old_w, int old_h,
int new_w, int new_h);
void vf_set_dar(int *d_width, int *d_height, int w, int h, double dar);
-struct vf_detc_pts_buf {
- double inpts_prev, outpts_prev;
- double lastdelta;
-};
-void vf_detc_init_pts_buf(struct vf_detc_pts_buf *p);
-/* Adjust pts when detelecining.
- * skip_frame: do not render this frame
- * reset_pattern: set to 1 if the telecine pattern has reset due to scene cut
- */
-double vf_detc_adjust_pts(struct vf_detc_pts_buf *p, double pts,
- bool reset_pattern, bool skip_frame);
-
#endif /* MPLAYER_VF_H */
diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c
deleted file mode 100644
index 6c416e0d41..0000000000
--- a/video/filter/vf_divtc.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <math.h>
-#include <stdint.h>
-
-#include <libavutil/bswap.h>
-
-#include "config.h"
-#include "common/msg.h"
-#include "options/m_option.h"
-
-#include "video/img_format.h"
-#include "video/mp_image.h"
-#include "vf.h"
-
-#include "video/memcpy_pic.h"
-
-const vf_info_t vf_info_divtc;
-
-struct vf_priv_s
- {
- int deghost, pass, phase, window, fcount, bcount, frameno, misscount,
- ocount, sum[5];
- double threshold;
- char *filename;
- FILE *file;
- int8_t *bdata;
- unsigned int *csdata;
- int *history;
- struct vf_detc_pts_buf ptsbuf;
- struct mp_image *buffer;
- };
-
-static int diff(unsigned char *old, unsigned char *new, int os, int ns)
- {
- int x, y, d=0;
-
- for(y=8; y; y--, new+=ns, old+=os)
- for(x=8; x; x--)
- d+=abs(new[x]-old[x]);
-
- return d;
- }
-
-static int diff_plane(unsigned char *old, unsigned char *new,
- int w, int h, int os, int ns, int arg)
- {
- int x, y, d, max=0, sum=0, n=0;
-
- for(y=0; y<h-7; y+=8)
- {
- for(x=0; x<w-7; x+=8)
- {
- d=diff(old+x+y*os, new+x+y*ns, os, ns);
- if(d>max) max=d;
- sum+=d;
- n++;
- }
- }
-
- return (sum+n*max)/2;
- }
-
-/*
-static unsigned int checksum_plane(unsigned char *p, unsigned char *z,
- int w, int h, int s, int zs, int arg)
- {
- unsigned int shift, sum;
- unsigned char *e;
-
- for(sum=0; h; h--, p+=s-w)
- for(e=p+w, shift=32; p<e;)
- sum^=(*p++)<<(shift=(shift-8)&31);
-
- return sum;
- }
-*/
-
-#define FAST_64BIT (UINTPTR_MAX >= UINT64_MAX)
-
-static unsigned int checksum_plane(unsigned char *p, unsigned char *z,
- int w, int h, int s, int zs, int arg)
- {
- unsigned int shift;
- uint32_t sum, t;
- unsigned char *e, *e2;
-#if FAST_64BIT
- typedef uint64_t wsum_t;
-#else
- typedef uint32_t wsum_t;
-#endif
- wsum_t wsum;
-
- for(sum=0; h; h--, p+=s-w)
- {
- for(shift=0, e=p+w; (size_t)p&(sizeof(wsum_t)-1) && p<e;)
- sum^=*p++<<(shift=(shift-8)&31);
-
- for(wsum=0, e2=e-sizeof(wsum_t)+1; p<e2; p+=sizeof(wsum_t))
- wsum^=*(wsum_t *)p;
-
-#if FAST_64BIT
- t=av_be2ne32((uint32_t)(wsum>>32^wsum));
-#else
- t=av_be2ne32(wsum);
-#endif
-
- for(sum^=(t<<shift|t>>(32-shift)); p<e;)
- sum^=*p++<<(shift=(shift-8)&31);
- }
-
- return sum;
- }
-
-static int deghost_plane(unsigned char *d, unsigned char *s,
- int w, int h, int ds, int ss, int threshold)
- {
- int t;
- unsigned char *e;
-
- for(; h; h--, s+=ss-w, d+=ds-w)
- for(e=d+w; d<e; d++, s++)
- if(abs(*d-*s)>=threshold)
- *d=(t=(*d<<1)-*s)<0?0:t>255?255:t;
-
- return 0;
- }
-
-static int copyop(unsigned char *d, unsigned char *s, int bpl, int h, int dstride, int sstride, int dummy) {
- memcpy_pic(d, s, bpl, h, dstride, sstride);
- return 0;
-}
-
-static int imgop(int(*planeop)(unsigned char *, unsigned char *,
- int, int, int, int, int),
- mp_image_t *dst, mp_image_t *src, int arg)
- {
- int sum = 0;
- for (int p = 0; p < dst->num_planes; p++) {
- sum += planeop(dst->planes[p], src ? src->planes[p] : NULL,
- (dst->w * dst->fmt.bytes[p]) >> dst->fmt.xs[p],
- dst->plane_h[p], dst->stride[p],
- src ? src->stride[p] : 0, arg);
- }
- return sum;
- }
-
-/*
- * Find the phase in which the telecine pattern fits best to the
- * given 5 frame slice of frame difference measurements.
- *
- * If phase1 and phase2 are not negative, only the two specified
- * phases are tested.
- */
-
-static int match(struct vf_priv_s *p, int *diffs,
- int phase1, int phase2, double *strength)
- {
- const int pattern1[]={ -4, 1, 1, 1, 1 },
- pattern2[]={ -2, -3, 4, 4, -3 }, *pattern;
- int f, m, n, t[5];
-
- pattern=p->deghost>0?pattern2:pattern1;
-
- for(f=0; f<5; f++)
- {
- if(phase1<0 || phase2<0 || f==phase1 || f==phase2)
- {
- for(n=t[f]=0; n<5; n++)
- t[f]+=diffs[n]*pattern[(n-f+5)%5];
- }
- else
- t[f]=INT_MIN;
- }
-
- /* find the best match */
- for(m=0, n=1; n<5; n++)
- if(t[n]>t[m]) m=n;
-
- if(strength)
- {
- /* the second best match */
- for(f=m?0:1, n=f+1; n<5; n++)
- if(n!=m && t[n]>t[f]) f=n;
-
- *strength=(t[m]>0?(double)(t[m]-t[f])/t[m]:0.0);
- }
-
- return m;
- }
-
-static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
- {
- int n, m, f, newphase;
- struct vf_priv_s *p=vf->priv;
- unsigned int checksum;
- double d;
-
- if (!p->buffer || p->buffer->w != mpi->w || p->buffer->h != mpi->h ||
- p->buffer->imgfmt != mpi->imgfmt)
- {
- mp_image_unrefp(&p->buffer);
- p->buffer = mp_image_alloc(mpi->imgfmt, mpi->w, mpi->h);
- talloc_steal(vf, p->buffer);
- if (!p->buffer)
- return NULL; // skip on OOM
- }
-
- struct mp_image *dmpi = p->buffer;
- double pts = mpi->pts;
-
- newphase=p->phase;
-
- switch(p->pass)
- {
- case 1:
- fprintf(p->file, "%08x %d\n",
- (unsigned int)imgop((void *)checksum_plane, mpi, 0, 0),
- p->frameno?imgop(diff_plane, dmpi, mpi, 0):0);
- break;
-
- case 2:
- if(p->frameno/5>p->bcount)
- {
- MP_ERR(vf, "\n%s: Log file ends prematurely! "
- "Switching to one pass mode.\n", vf->info->name);
- p->pass=0;
- break;
- }
-
- checksum=(unsigned int)imgop((void *)checksum_plane, mpi, 0, 0);
-
- if(checksum!=p->csdata[p->frameno])
- {
- for(f=0; f<100; f++)
- if(p->frameno+f<p->fcount && p->csdata[p->frameno+f]==checksum)
- break;
- else if(p->frameno-f>=0 && p->csdata[p->frameno-f]==checksum)
- {
- f=-f;
- break;
- }
-
- if(f<100)
- {
- MP_INFO(vf, "\n%s: Mismatch with pass-1: %+d frame(s).\n",
- vf->info->name, f);
-
- p->frameno+=f;
- p->misscount=0;
- }
- else if(p->misscount++>=30)
- {
- MP_ERR(vf, "\n%s: Sync with pass-1 lost! "
- "Switching to one pass mode.\n", vf->info->name);
- p->pass=0;
- break;
- }
- }
-
- n=(p->frameno)/5;
- if(n>=p->bcount) n=p->bcount-1;
-
- newphase=p->bdata[n];
- break;
-
- default:
- if(p->frameno)
- {
- int *sump=p->sum+p->frameno%5,
- *histp=p->history+p->frameno%p->window;
-
- *sump-=*histp;
- *sump+=(*histp=imgop(diff_plane, dmpi, mpi, 0));
- }
-
- m=match(p, p->sum, -1, -1, &d);
-
- if(d>=p->threshold)
- newphase=m;
- }
-
- n=p->ocount++%5;
-
- if(newphase!=p->phase && ((p->phase+4)%5<n)==((newphase+4)%5<n))
- {
- p->phase=newphase;
- MP_INFO(vf, "\n%s: Telecine phase %d.\n", vf->info->name, p->phase);
- }
-
- switch((p->frameno++-p->phase+10)%5)
- {
- case 0:
- imgop(copyop, dmpi, mpi, 0);
- vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 1);
- talloc_free(mpi);
- return 0;
-
- case 4:
- if(p->deghost>0)
- {
- imgop(copyop, dmpi, mpi, 0);
- if (!vf_make_out_image_writeable(vf, mpi))
- return NULL; // oom: eof
-
- imgop(deghost_plane, mpi, dmpi, p->deghost);
- mpi->pts = vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 0);
- return mpi;
- }
- }
-
- imgop(copyop, dmpi, mpi, 0);
- mpi->pts = vf_detc_adjust_pts(&p->ptsbuf, pts, 0, 0);
- return mpi;
- }
-
-static int analyze(struct vf_instance *vf)
- {
- struct vf_priv_s *p = vf->priv;
- int *buf=0, *bp, bufsize=0, n, b, f, i, j, m, s;
- unsigned int *cbuf=0, *cp;
- int8_t *pbuf;
- int8_t lbuf[256];
- int sum[5];
- double d;
-
- /* read the file */
-
- n=15;
- while(fgets(lbuf, 256, p->file))
- {
- if(n>=bufsize-19)
- {
- bufsize=bufsize?bufsize*2:30000;
- if((bp=realloc(buf, bufsize*sizeof *buf))) buf=bp;
- if((cp=realloc(cbuf, bufsize*sizeof *cbuf))) cbuf=cp;
-
- if(!bp || !cp)
- {
- MP_FATAL(vf, "%s: Not enough memory.\n",
- vf_info_divtc.name);
- free(buf);
- free(cbuf);
- return 0;
- }
- }
- sscanf(lbuf, "%x %d", cbuf+n, buf+n);
- n++;
- }
-
- if(n <= 15)
- {
- MP_FATAL(vf, "%s: Empty 2-pass log file.\n",
- vf_info_divtc.name);
- free(buf);
- free(cbuf);
- return 0;
- }
-
- /* generate some dummy data past the beginning and end of the array */
-
- buf+=15, cbuf+=15;
- n-=15;
-
- memcpy(buf-15, buf, 15*sizeof *buf);
- memset(cbuf-15, 0, 15*sizeof *cbuf);
-
- while(n%5)
- buf[n]=buf[n-5], cbuf[n]=0, n++;
-
- memcpy(buf+n, buf+n-15, 15*sizeof *buf);
- memset(cbuf+n, 0, 15*sizeof *cbuf);
-
- p->csdata=cbuf;
- p->fcount=n;
-
- /* array with one slot for each slice of 5 frames */
-
- p->bdata=pbuf=malloc(p->bcount=b=(n/5));
- memset(pbuf, 255, b);
-
- /* resolve the automatic mode */
-
- if(p->deghost<0)
- {
- int deghost=-p->deghost;
- double s0=0.0, s1=0.0;
-
- for(f=0; f<n; f+=5)
- {
- p->deghost=0; match(p, buf+f, -1, -1, &d); s0+=d;
- p->deghost=1; match(p, buf+f, -1, -1, &d); s1+=d;
- }
-
- p->deghost=s1>s0?deghost:0;
-
- MP_INFO(vf, "%s: Deghosting %-3s (relative pattern strength %+.2fdB).\n",
- vf_info_divtc.name,
- p->deghost?"ON":"OFF",
- 10.0*log10(s1/s0));
- }
-
- /* analyze the data */
-
- for(f=0; f<5; f++)
- for(sum[f]=0, n=-15; n<20; n+=5)
- sum[f]+=buf[n+f];
-
- for(f=0; f<b; f++)
- {
- m=match(p, sum, -1, -1, &d);
-
- if(d>=p->threshold)
- pbuf[f]=m;
-
- if(f<b-1)
- for(n=0; n<5; n++)
- sum[n]=sum[n]-buf[5*(f-3)+n]+buf[5*(f+4)+n];
- }
-
- /* fill in the gaps */
-
- /* the beginning */
- for(f=0; f<b && pbuf[f]==-1; f++);
-
- if(f==b)
- {
- free(buf-15);
- MP_FATAL(vf, "%s: No telecine pattern found!\n",
- vf_info_divtc.name);
- return 0;
- }
-
- for(n=0; n<f; pbuf[n++]=pbuf[f]);
-
- /* the end */
- for(f=b-1; pbuf[f]==-1; f--);
- for(n=f+1; n<b; pbuf[n++]=pbuf[f]);
-
- /* the rest */
- for(f=0;;)
- {
- while(f<b && pbuf[f]!=-1) f++;
- if(f==b) break;
- for(n=f; pbuf[n]==-1; n++);
-
- if(pbuf[f-1]==pbuf[n])
- {
- /* just a gap */
- while(f<n) pbuf[f++]=pbuf[n];
- }
- else
- {
- /* phase change, reanalyze the original data in the gap with zero
- threshold for only the two phases that appear at the ends */
-
- for(i=0; i<5; i++)
- for(sum[i]=0, j=5*f-15; j<5*f; j+=5)
- sum[i]+=buf[i+j];
-
- for(i=f; i<n; i++)
- {
- pbuf[i]=match(p, sum, pbuf[f-1], pbuf[n], 0);
-
- for(j=0; j<5; j++)
- sum[j]=sum[j]-buf[5*(i-3)+j]+buf[5*(i+4)+j];
- }
-
- /* estimate the transition point by dividing the gap
- in the same proportion as the number of matches of each kind */
-
- for(i=f, m=f; i<n; i++)
- if(pbuf[i]==pbuf[f-1]) m++;
-
- /* find the transition of the right direction nearest to the
- estimated point */
-
- if(m>f && m<n)
- {
- for(j=m; j>f; j--)
- if(pbuf[j-1]==pbuf[f-1] && pbuf[j]==pbuf[n]) break;
- for(s=m; s<n; s++)
- if(pbuf[s-1]==pbuf[f-1] && pbuf[s]==pbuf[n]) break;
-
- m=(s-m<m-j)?s:j;
- }
-
- /* and rewrite the data to allow only this one transition */
-
- for(i=f; i<m; i++)
- pbuf[i]=pbuf[f-1];
-
- for(; i<n; i++)
- pbuf[i]=pbuf[n];
-
- f=n;
- }
- }
-
- free(buf-15);
-
- return 1;
- }
-
-static int query_format(struct vf_instance *vf, unsigned int fmt)
- {
- switch(fmt)
- {
- case IMGFMT_444P: case IMGFMT_RGB24:
- case IMGFMT_422P: case IMGFMT_UYVY: case IMGFMT_BGR24:
- case IMGFMT_411P: case IMGFMT_YUYV: case IMGFMT_410P:
- case IMGFMT_420P: case IMGFMT_Y8:
- return vf_next_query_format(vf,fmt);
- }
-
- return 0;
- }
-
-static void uninit(struct vf_instance *vf)
- {
- if(vf->priv)
- {
- if(vf->priv->file) fclose(vf->priv->file);
- if(vf->priv->csdata) free(vf->priv->csdata-15);
- free(vf->priv->bdata);
- free(vf->priv->history);
- }
- }
-
-static int control(vf_instance_t *vf, int request, void *data)
-{
- switch (request) {
- case VFCTRL_SEEK_RESET:
- vf_detc_init_pts_buf(&vf->priv->ptsbuf);
- return CONTROL_OK;
- }
- return CONTROL_UNKNOWN;
-}
-
-static int vf_open(vf_instance_t *vf)
- {
- struct vf_priv_s *p = vf->priv;
-
- vf->filter=filter;
- vf->uninit=uninit;
- vf->query_format=query_format;
- vf->control=control;
-
- p->window=5*(p->window+4)/5;
-
- if (!p->filename)
- p->pass = 0;
-
- switch(p->pass)
- {
- case 1:
- if(!(p->file=fopen(p->filename, "w")))
- {
- MP_FATAL(vf, "%s: Can't create file %s.\n", vf->info->name, p->filename);
- goto fail;
- }
-
- break;
-
- case 2:
- if(!(p->file=fopen(p->filename, "r")))
- {
- MP_FATAL(vf, "%s: Can't open file %s.\n", vf->info->name, p->filename);
- goto fail;
- }
-
- if(!analyze(vf))
- goto fail;
-
- fclose(p->file);
- p->file=0;
- break;
- }
-
- if(!(p->history=calloc(sizeof *p->history, p->window)))
- abort();
-
- vf_detc_init_pts_buf(&p->ptsbuf);
- return 1;
- fail:
- uninit(vf);
- return 0;
- }
-
-#define OPT_BASE_STRUCT struct vf_priv_s
-const vf_info_t vf_info_divtc = {
- .description = "inverse telecine for deinterlaced video",
- .name = "divtc",
- .open = vf_open,
- .priv_size = sizeof(struct vf_priv_s),
- .priv_defaults = &(const struct vf_priv_s){
- .phase = 5,
- .threshold = 0.5,
- .window = 30,
- },
- .options = (const struct m_option[]){
- OPT_INTRANGE("phase", phase, 0, 0, 4),
- OPT_INTRANGE("pass", pass, 0, 0, 2),
- OPT_DOUBLE("threshold", threshold, 0),
- OPT_INTRANGE("window", window, 0, 5, 9999),
- OPT_INT("deghost", deghost, 0),
- OPT_STRING("file", filename, 0),
- {0}
- },
-};
diff --git a/wscript_build.py b/wscript_build.py
index 27b50fcca2..f46843c714 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -298,7 +298,6 @@ def build(ctx):
( "video/filter/vf_buffer.c" ),
( "video/filter/vf_crop.c" ),
( "video/filter/vf_delogo.c" ),
- ( "video/filter/vf_divtc.c" ),
( "video/filter/vf_dlopen.c", "dlopen" ),
( "video/filter/vf_dsize.c" ),
( "video/filter/vf_eq.c" ),