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.
2018-01-16 11:53:44 +01:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
#include "options/m_option.h"
|
|
|
|
|
|
|
|
|
|
#include "f_output_chain.h"
|
|
|
|
|
|
|
|
|
|
// For creating filters from command line. Strictly for --vf/--af.
|
|
|
|
|
struct mp_user_filter_entry {
|
|
|
|
|
// Name and sub-option description.
|
|
|
|
|
struct m_obj_desc desc;
|
|
|
|
|
// Create a filter. The option pointer is non-NULL if desc implies a priv
|
|
|
|
|
// struct to be allocated; then options are parsed into it. The callee
|
|
|
|
|
// must always free options (but can reparent it with talloc to keep it).
|
|
|
|
|
struct mp_filter *(*create)(struct mp_filter *parent, void *options);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct mp_filter *mp_create_user_filter(struct mp_filter *parent,
|
|
|
|
|
enum mp_output_chain_type type,
|
|
|
|
|
const char *name, char **args);
|
|
|
|
|
|
2018-01-18 14:44:20 +01:00
|
|
|
extern const struct mp_user_filter_entry af_lavfi;
|
|
|
|
|
extern const struct mp_user_filter_entry af_lavfi_bridge;
|
|
|
|
|
extern const struct mp_user_filter_entry af_scaletempo;
|
|
|
|
|
extern const struct mp_user_filter_entry af_format;
|
|
|
|
|
extern const struct mp_user_filter_entry af_rubberband;
|
|
|
|
|
extern const struct mp_user_filter_entry af_lavcac3enc;
|
|
|
|
|
|
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.
2018-01-16 11:53:44 +01:00
|
|
|
extern const struct mp_user_filter_entry vf_lavfi;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_lavfi_bridge;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_sub;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_vapoursynth;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_vapoursynth_lazy;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_format;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_vdpaupp;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_vavpp;
|
|
|
|
|
extern const struct mp_user_filter_entry vf_d3d11vpp;
|