video: rewrite filtering glue code

Get rid of the old vf.c code. Replace it with a generic filtering
framework, which can potentially handle more than just --vf. At least
reimplementing --af with this code is planned.

This changes some --vf semantics (including runtime behavior and the
"vf" command). The most important ones are listed in interface-changes.

vf_convert.c is renamed to f_swscale.c. It is now an internal filter
that can not be inserted by the user manually.

f_lavfi.c is a refactor of player/lavfi.c. The latter will be removed
once --lavfi-complex is reimplemented on top of f_lavfi.c. (which is
conceptually easy, but a big mess due to the data flow changes).

The existing filters are all changed heavily. The data flow of the new
filter framework is different. Especially EOF handling changes - EOF is
now a "frame" rather than a state, and must be passed through exactly
once.

Another major thing is that all filters must support dynamic format
changes. The filter reconfig() function goes away. (This sounds complex,
but since all filters need to handle EOF draining anyway, they can use
the same code, and it removes the mess with reconfig() having to predict
the output format, which completely breaks with libavfilter anyway.)

In addition, there is no automatic format negotiation or conversion.
libavfilter's primitive and insufficient API simply doesn't allow us to
do this in a reasonable way. Instead, filters can use f_autoconvert as
sub-filter, and tell it which formats they support. This filter will in
turn add actual conversion filters, such as f_swscale, to perform
necessary format changes.

vf_vapoursynth.c uses the same basic principle of operation as before,
but with worryingly different details in data flow. Still appears to
work.

The hardware deint filters (vf_vavpp.c, vf_d3d11vpp.c, vf_vdpaupp.c) are
heavily changed. Fortunately, they all used refqueue.c, which is for
sharing the data flow logic (especially for managing future/past
surfaces and such). It turns out it can be used to factor out most of
the data flow. Some of these filters accepted software input. Instead of
having ad-hoc upload code in each filter, surface upload is now
delegated to f_autoconvert, which can use f_hwupload to perform this.

Exporting VO capabilities is still a big mess (mp_stream_info stuff).

The D3D11 code drops the redundant image formats, and all code uses the
hw_subfmt (sw_format in FFmpeg) instead. Although that too seems to be a
big mess for now.

f_async_queue is unused.

1 files changed, 0 insertions, 179 deletions

diff --git a/video/filter/vf.h b/video/filter/vf.h
deleted file mode 100644
index 5146a4d15b..0000000000
--- a/video/filter/vf.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * mpv 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MPLAYER_VF_H
-#define MPLAYER_VF_H
-
-#include <stdbool.h>
-
-#include "video/mp_image.h"
-#include "common/common.h"
-
-struct MPOpts;
-struct mpv_global;
-struct vf_instance;
-struct vf_priv_s;
-struct m_obj_settings;
-
-typedef struct vf_info {
-    const char *description;
-    const char *name;
-    int (*open)(struct vf_instance *vf);
-    int priv_size;
-    const void *priv_defaults;
-    const struct m_option *options;
-    void (*print_help)(struct mp_log *log);
-    bool (*test_conversion)(int in, int out);
-} vf_info_t;
-
-typedef struct vf_instance {
-    const vf_info_t *info;
-    char *full_name;
-
-    // Initialize the filter. The filter must set *out to the same image
-    // params as the images the filter functions will return for the given
-    // *in format.
-    // Note that by default, only formats reported as supported by query_format
-    // will be allowed for *in.
-    // Returns >= 0 on success, < 0 on error.
-    int (*reconfig)(struct vf_instance *vf, struct mp_image_params *in,
-                    struct mp_image_params *out);
-
-    int (*control)(struct vf_instance *vf, int request, void *data);
-    int (*query_format)(struct vf_instance *vf, unsigned int fmt);
-
-    // Filter mpi and return the result. The input mpi reference is owned by
-    // the filter, the returned reference is owned by the caller.
-    // Return NULL if the output frame is skipped.
-    struct mp_image *(*filter)(struct vf_instance *vf, struct mp_image *mpi);
-
-    // Like filter(), but can return an error code ( >= 0 means success). This
-    // callback is also more practical when the filter can return multiple
-    // output images. Use vf_add_output_frame() to queue output frames.
-    // Warning: this is called with mpi==NULL if there is no more input at
-    //          all (i.e. the video has reached end of file condition). This
-    //          can be used to output delayed or otherwise remaining images.
-    int (*filter_ext)(struct vf_instance *vf, struct mp_image *mpi);
-
-    // Produce an output frame. This is called after filter or filter_ext.
-    // You can add 0 or more frames with vf_add_output_frame(). (This allows
-    // distributing the filter load over time -> typically add at most 1 frame.)
-    // If this adds no frame (or is NULL), then the caller assumes that the
-    // filter needs new input.
-    // Return a negative value on error. (No more frames is not an error.)
-    // May be called multiple times, even if the filter gives no output.
-    int (*filter_out)(struct vf_instance *vf);
-
-    // Optional function that checks whether the filter needs additional
-    // input. This is for filters with asynchronous behavior: they filter
-    // frames in the background, and to get good pipelining behavior, new
-    // data should be fed, even if the playback core doesn't need any yet.
-    bool (*needs_input)(struct vf_instance *vf);
-
-    void (*uninit)(struct vf_instance *vf);
-
-    char *label;
-    bool autoinserted;
-
-    struct mp_image_params fmt_in, fmt_out;
-
-    // This is a dirty hack.
-    struct AVBufferRef *in_hwframes_ref, *out_hwframes_ref;
-
-    struct mp_image_pool *out_pool;
-    struct vf_priv_s *priv;
-    struct mp_log *log;
-    struct mp_hwdec_devices *hwdec_devs;
-
-    struct mp_image **out_queued;
-    int num_out_queued;
-
-    // Caches valid output formats.
-    uint8_t last_outfmts[IMGFMT_END - IMGFMT_START];
-
-    struct vf_chain *chain;
-    struct vf_instance *next;
-} vf_instance_t;
-
-// A chain of video filters
-struct vf_chain {
-    int initialized; // 0: no, 1: yes, -1: attempted to, but failed
-
-    struct vf_instance *first, *last;
-
-    struct mp_image_params input_params;
-    struct mp_image_params output_params;
-    uint8_t allowed_output_formats[IMGFMT_END - IMGFMT_START];
-
-    double container_fps;
-    double display_fps;
-
-    struct mp_log *log;
-    struct MPOpts *opts;
-    struct mpv_global *global;
-    struct mp_hwdec_devices *hwdec_devs;
-
-    // This is a dirty hack.
-    struct AVBufferRef *in_hwframes_ref;
-
-    // Call when the filter chain wants new processing (for filters with
-    // asynchronous behavior) - must be immutable once filters are created,
-    // since they are supposed to call it from foreign threads.
-    void (*wakeup_callback)(void *ctx);
-    void *wakeup_callback_ctx;
-};
-
-enum vf_ctrl {
-    VFCTRL_SEEK_RESET = 1,   // reset on picture and PTS discontinuities
-    VFCTRL_GET_METADATA,     // Get frame metadata from lavfi filters (e.g., cropdetect)
-    /* Hack to make the OSD state object available to vf_sub which
-     * access OSD/subtitle state outside of normal OSD draw time. */
-    VFCTRL_INIT_OSD,
-    VFCTRL_COMMAND,
-};
-
-struct vf_chain *vf_new(struct mpv_global *global);
-void vf_destroy(struct vf_chain *c);
-void vf_set_proto_frame(struct vf_chain *c, struct mp_image *img);
-int vf_reconfig(struct vf_chain *c, const struct mp_image_params *params);
-int vf_control_any(struct vf_chain *c, int cmd, void *arg);
-int vf_control_by_label(struct vf_chain *c, int cmd, void *arg, bstr label);
-int vf_filter_frame(struct vf_chain *c, struct mp_image *img);
-int vf_output_frame(struct vf_chain *c, bool eof);
-int vf_needs_input(struct vf_chain *c);
-struct mp_image *vf_read_output_frame(struct vf_chain *c);
-void vf_unread_output_frame(struct vf_chain *c, struct mp_image *img);
-void vf_seek_reset(struct vf_chain *c);
-struct vf_instance *vf_append_filter(struct vf_chain *c, const char *name,
-                                     char **args);
-void vf_remove_filter(struct vf_chain *c, struct vf_instance *vf);
-int vf_append_filter_list(struct vf_chain *c, struct m_obj_settings *list);
-struct vf_instance *vf_find_by_label(struct vf_chain *c, const char *label);
-void vf_print_filter_chain(struct vf_chain *c, int msglevel,
-                           struct vf_instance *vf);
-
-int vf_send_command(struct vf_chain *c, char *label, char *cmd, char *arg);
-
-// Filter internal API
-struct mp_image *vf_alloc_out_image(struct vf_instance *vf);
-bool vf_make_out_image_writeable(struct vf_instance *vf, struct mp_image *img);
-void vf_add_output_frame(struct vf_instance *vf, struct mp_image *img);
-
-// default wrappers:
-int vf_next_query_format(struct vf_instance *vf, unsigned int fmt);
-
-#endif /* MPLAYER_VF_H */