mirror of
https://github.com/mpv-player/mpv
synced 2024-08-20 08:55:06 +02:00
76276c9210
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.
40 lines
1.6 KiB
C
40 lines
1.6 KiB
C
#pragma once
|
|
|
|
#include "filter.h"
|
|
|
|
// A filter which automatically creates and uses a conversion filter based on
|
|
// the filter settings, or passes through data unchanged if no conversion is
|
|
// required.
|
|
struct mp_autoconvert {
|
|
// f->pins[0] is input, f->pins[1] is output
|
|
struct mp_filter *f;
|
|
};
|
|
|
|
// (to free this, free the filter itself, mp_autoconvert.f)
|
|
struct mp_autoconvert *mp_autoconvert_create(struct mp_filter *parent);
|
|
|
|
// Add the imgfmt as allowed video image format, and error on non-video frames.
|
|
// Each call adds to the list of allowed formats. Before the first call, all
|
|
// formats are allowed (even non-video).
|
|
// subfmt can be used to specify underlying surface formats for hardware formats,
|
|
// otherwise must be 0.
|
|
void mp_autoconvert_add_imgfmt(struct mp_autoconvert *c, int imgfmt, int subfmt);
|
|
|
|
// Add the formats supported by the hwdec interops (or essentially refine them),
|
|
// and trigger conversion if hw_subfmts mismatch. This is mostly a hack for
|
|
// D3D11/ANGLE (which supports NV12 only).
|
|
// Must be called mp_autoconvert_add_imgfmt(), and overrides them where formats
|
|
// collide.
|
|
struct mp_hwdec_devices;
|
|
void mp_autoconvert_add_vo_hwdec_subfmts(struct mp_autoconvert *c,
|
|
struct mp_hwdec_devices *devs);
|
|
|
|
// Reset set of allowed formats back to initial state. (This does not flush
|
|
// any frames or remove currently active filters, although to get reasonable
|
|
// behavior, you need to readd all previously allowed formats, or reset the
|
|
// filter.)
|
|
void mp_autoconvert_clear(struct mp_autoconvert *c);
|
|
|
|
// vf_d3d11vpp.c
|
|
struct mp_filter *vf_d3d11_create_outconv(struct mp_filter *parent);
|