vf_pullup: remove builtin implementation

Now it requires libavfilter. The wrapper is left in place, so FFmpeg
users will not notice any change. On Libav, the filter stops working.

1 files changed, 10 insertions, 213 deletions

diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 763783dc9e..fbf500d8cd 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -20,22 +20,13 @@
 #include <stdlib.h>
 #include <string.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"
-
-#include "pullup.h"
 #include "vf_lavfi.h"
 
-#undef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-
 struct vf_priv_s {
         struct pullup_context *ctx;
         int init;
@@ -46,213 +37,19 @@ struct vf_priv_s {
         struct vf_lw_opts *lw_opts;
 };
 
-static void reset(struct vf_instance *vf)
-{
-    if (vf->priv->ctx)
-        pullup_free_context(vf->priv->ctx);
-    vf->priv->init = 0;
-    struct pullup_context *c;
-    vf->priv->ctx = c = pullup_alloc_context();
-    vf->priv->fakecount = 1;
-    c->junk_left = vf->priv->junk_left;
-    c->junk_right = vf->priv->junk_right;
-    c->junk_top = vf->priv->junk_top;
-    c->junk_bottom = vf->priv->junk_bottom;
-    c->strict_breaks = vf->priv->strict_breaks;
-    c->metric_plane = vf->priv->metric_plane;
-}
-
-static void init_pullup(struct vf_instance *vf, mp_image_t *mpi)
-{
-        struct pullup_context *c = vf->priv->ctx;
-
-                c->format = PULLUP_FMT_Y;
-                c->nplanes = 4;
-                pullup_preinit_context(c);
-                c->bpp[0] = c->bpp[1] = c->bpp[2] = 8;
-                c->w[0] = mpi->w;
-                c->h[0] = mpi->h;
-                c->w[1] = c->w[2] = mpi->chroma_width;
-                c->h[1] = c->h[2] = mpi->chroma_height;
-                c->w[3] = ((mpi->w+15)/16) * ((mpi->h+15)/16);
-                c->h[3] = 2;
-                c->stride[0] = mpi->w;
-                c->stride[1] = c->stride[2] = mpi->chroma_width;
-                c->stride[3] = c->w[3];
-                c->background[1] = c->background[2] = 128;
-
-        pullup_init_context(c);
-
-        vf->priv->init = 1;
-}
-
-static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
-{
-        struct pullup_context *c = vf->priv->ctx;
-        struct pullup_buffer *b;
-        struct pullup_frame *f;
-        int p;
-        double pts = mpi->pts;
-        struct mp_image *dmpi = NULL;
-
-        if (!vf->priv->init) init_pullup(vf, mpi);
-
-        if (1) {
-                b = pullup_get_buffer(c, 2);
-                if (!b) {
-                        MP_ERR(vf, "Could not get buffer from pullup!\n");
-                        f = pullup_get_frame(c);
-                        pullup_release_frame(f);
-                        goto skip;
-                }
-                memcpy_pic(b->planes[0], mpi->planes[0], mpi->w, mpi->h,
-                        c->stride[0], mpi->stride[0]);
-                        memcpy_pic(b->planes[1], mpi->planes[1],
-                                mpi->chroma_width, mpi->chroma_height,
-                                c->stride[1], mpi->stride[1]);
-                        memcpy_pic(b->planes[2], mpi->planes[2],
-                                mpi->chroma_width, mpi->chroma_height,
-                                c->stride[2], mpi->stride[2]);
-        }
-        p = mpi->fields & MP_IMGFIELD_TOP_FIRST ? 0 :
-                (mpi->fields & MP_IMGFIELD_ORDERED ? 1 : 0);
-
-        if (pts == MP_NOPTS_VALUE) {
-                pullup_submit_field(c, b, p, MP_NOPTS_VALUE);
-                pullup_submit_field(c, b, p^1, MP_NOPTS_VALUE);
-                if (mpi->fields & MP_IMGFIELD_REPEAT_FIRST)
-                        pullup_submit_field(c, b, p, MP_NOPTS_VALUE);
-        } else {
-                double delta;
-                if (vf->priv->lastpts == MP_NOPTS_VALUE)
-                        delta = 1001.0/60000.0; // delta = field time distance
-                else
-                        delta = (pts - vf->priv->lastpts) / 2;
-                if (delta <= 0.0 || delta >= 0.5)
-                        delta = 0.0;
-                vf->priv->lastpts = pts;
-                if (mpi->fields & MP_IMGFIELD_REPEAT_FIRST) {
-                        pullup_submit_field(c, b, p, pts - delta);
-                        pullup_submit_field(c, b, p^1, pts);
-                        pullup_submit_field(c, b, p, pts + delta);
-                } else {
-                        pullup_submit_field(c, b, p, pts - delta * 0.5);
-                        pullup_submit_field(c, b, p^1, pts + delta * 0.5);
-                }
-        }
-
-        pullup_release_buffer(b, 2);
-
-        f = pullup_get_frame(c);
-
-        /* Fake yes for first few frames (buffer depth) to keep from
-         * breaking A/V sync with G1's bad architecture... */
-        //if (!f) return vf->priv->fakecount ? (--vf->priv->fakecount,1) : 0;
-        if (!f)
-            goto skip;
-
-        if (f->length < 2) {
-                pullup_release_frame(f);
-                f = pullup_get_frame(c);
-                if (!f) goto skip;
-                if (f->length < 2) {
-                        pullup_release_frame(f);
-                        if (!(mpi->fields & MP_IMGFIELD_REPEAT_FIRST))
-                                goto skip;
-                        f = pullup_get_frame(c);
-                        if (!f) goto skip;
-                        if (f->length < 2) {
-                                pullup_release_frame(f);
-                                goto skip;
-                        }
-                }
-        }
-
-        /* If the frame isn't already exportable... */
-        if (!f->buffer)
-            pullup_pack_frame(c, f);
-
-        // NOTE: the copy could probably be avoided by changing or using the
-        //       pullup internal buffer management. But right now just do the
-        //       safe thing and always copy. Code outside the filter might
-        //       hold a buffer reference even if the filter chain is destroyed.
-        dmpi = vf_alloc_out_image(vf);
-        if (!dmpi)
-            return NULL;
-        mp_image_copy_attributes(dmpi, mpi);
-
-        struct mp_image data = *dmpi;
-
-        data.planes[0] = f->buffer->planes[0];
-        data.planes[1] = f->buffer->planes[1];
-        data.planes[2] = f->buffer->planes[2];
-
-        data.stride[0] = c->stride[0];
-        data.stride[1] = c->stride[1];
-        data.stride[2] = c->stride[2];
-
-        mp_image_copy(dmpi, &data);
-
-        dmpi->pts = f->pts;
-
-        pullup_release_frame(f);
-
-skip:
-        talloc_free(mpi);
-        return dmpi;
-}
-
-static int query_format(struct vf_instance *vf, unsigned int fmt)
-{
-        /* FIXME - support more formats */
-        switch (fmt) {
-        case IMGFMT_420P:
-                return vf_next_query_format(vf, fmt);
-        }
-        return 0;
-}
-
-static int config(struct vf_instance *vf,
-        int width, int height, int d_width, int d_height,
-        unsigned int flags, unsigned int outfmt)
-{
-        reset(vf);
-        if (height&3) return 0;
-        return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt);
-}
-
-static void uninit(struct vf_instance *vf)
-{
-        pullup_free_context(vf->priv->ctx);
-}
-
-static int control(vf_instance_t *vf, int request, void *data)
+static int vf_open(vf_instance_t *vf)
 {
-    switch (request) {
-    case VFCTRL_SEEK_RESET:
-        reset(vf);
-        return CONTROL_OK;
+    struct vf_priv_s *p = vf->priv;
+    const char *pname[3] = {"y", "u", "v"};
+    if (vf_lw_set_graph(vf, p->lw_opts, "pullup", "%d:%d:%d:%d:%d:%s",
+                        p->junk_left, p->junk_right, p->junk_top, p->junk_bottom,
+                        p->strict_breaks, pname[p->metric_plane]) >= 0)
+    {
+        return 1;
     }
-    return CONTROL_UNKNOWN;
-}
 
-static int vf_open(vf_instance_t *vf)
-{;
-        vf->filter = filter;
-        vf->config = config;
-        vf->query_format = query_format;
-        vf->control = control;
-        vf->uninit = uninit;
-        struct vf_priv_s *p = vf->priv;
-        const char *pname[3] = {"y", "u", "v"};
-        if (vf_lw_set_graph(vf, p->lw_opts, "pullup", "%d:%d:%d:%d:%d:%s",
-                            p->junk_left, p->junk_right, p->junk_top, p->junk_bottom,
-                            p->strict_breaks, pname[p->metric_plane]) >= 0)
-        {
-            return 1;
-        }
-        reset(vf);
-        return 1;
+    MP_FATAL(vf, "Requires libavfilter.\n");
+    return 0;
 }
 
 #define OPT_BASE_STRUCT struct vf_priv_s