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 10:53:44 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2018-01-18 13:44:20 +00:00
|
|
|
#include "audio/aframe.h"
|
|
|
|
#include "audio/chmap_sel.h"
|
|
|
|
#include "audio/format.h"
|
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 10:53:44 +00:00
|
|
|
#include "common/common.h"
|
|
|
|
#include "common/msg.h"
|
|
|
|
#include "video/hwdec.h"
|
|
|
|
#include "video/mp_image.h"
|
|
|
|
|
|
|
|
#include "f_autoconvert.h"
|
|
|
|
#include "f_hwtransfer.h"
|
2018-01-18 13:44:20 +00:00
|
|
|
#include "f_swresample.h"
|
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 10:53:44 +00:00
|
|
|
#include "f_swscale.h"
|
|
|
|
#include "f_utils.h"
|
|
|
|
#include "filter.h"
|
|
|
|
#include "filter_internal.h"
|
|
|
|
|
|
|
|
struct priv {
|
|
|
|
struct mp_log *log;
|
|
|
|
|
|
|
|
struct mp_subfilter sub;
|
|
|
|
|
|
|
|
bool force_update;
|
|
|
|
|
|
|
|
int *imgfmts;
|
|
|
|
int *subfmts;
|
|
|
|
int num_imgfmts;
|
|
|
|
|
|
|
|
// Enable special conversion for the final stage before the VO.
|
|
|
|
bool vo_convert;
|
|
|
|
|
|
|
|
// sws state
|
|
|
|
int in_imgfmt, in_subfmt;
|
|
|
|
|
2018-01-18 13:44:20 +00:00
|
|
|
int *afmts;
|
|
|
|
int num_afmts;
|
|
|
|
int *srates;
|
|
|
|
int num_srates;
|
|
|
|
struct mp_chmap_sel chmaps;
|
|
|
|
|
|
|
|
int in_afmt, in_srate;
|
|
|
|
struct mp_chmap in_chmap;
|
|
|
|
|
|
|
|
double audio_speed;
|
|
|
|
bool resampling_forced;
|
|
|
|
|
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 10:53:44 +00:00
|
|
|
struct mp_autoconvert public;
|
|
|
|
};
|
|
|
|
|
|
|
|
// Dummy filter for bundling sub-conversion filters.
|
|
|
|
static const struct mp_filter_info convert_filter = {
|
|
|
|
.name = "convert",
|
|
|
|
};
|
|
|
|
|
|
|
|
// For hw decoding: thing which can convert between underlying surface formats.
|
|
|
|
// The filter detects the needed target format from struct mp_hwdec_ctx.
|
|
|
|
struct subfmt_conv {
|
|
|
|
int hw_imgfmt;
|
|
|
|
struct mp_filter *(*create)(struct mp_filter *parent);
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct subfmt_conv subfmt_converters[] = {
|
|
|
|
#if HAVE_D3D_HWACCEL
|
|
|
|
{IMGFMT_D3D11, vf_d3d11_create_outconv},
|
|
|
|
#endif
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
void mp_autoconvert_clear(struct mp_autoconvert *c)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
|
|
|
|
p->num_imgfmts = 0;
|
2018-01-18 13:44:20 +00:00
|
|
|
p->num_afmts = 0;
|
|
|
|
p->num_srates = 0;
|
|
|
|
p->chmaps = (struct mp_chmap_sel){0};
|
|
|
|
p->force_update = true;
|
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 10:53:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mp_autoconvert_add_imgfmt(struct mp_autoconvert *c, int imgfmt, int subfmt)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
|
|
|
|
MP_TARRAY_GROW(p, p->imgfmts, p->num_imgfmts);
|
|
|
|
MP_TARRAY_GROW(p, p->subfmts, p->num_imgfmts);
|
|
|
|
|
|
|
|
p->imgfmts[p->num_imgfmts] = imgfmt;
|
|
|
|
p->subfmts[p->num_imgfmts] = subfmt;
|
|
|
|
|
|
|
|
p->num_imgfmts += 1;
|
|
|
|
p->force_update = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_autoconvert_add_vo_hwdec_subfmts(struct mp_autoconvert *c,
|
|
|
|
struct mp_hwdec_devices *devs)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
assert(devs);
|
|
|
|
|
|
|
|
int prev_format = 0;
|
|
|
|
|
|
|
|
for (int n = 0; ; n++) {
|
|
|
|
struct mp_hwdec_ctx *ctx = hwdec_devices_get_n(devs, n);
|
|
|
|
if (!ctx)
|
|
|
|
break;
|
|
|
|
if (!ctx->hw_imgfmt || !ctx->supported_formats)
|
|
|
|
continue;
|
|
|
|
// Very hacky: don't let d3d11-egl-rgb overwrite d3d11-egl
|
|
|
|
if (ctx->hw_imgfmt == prev_format)
|
|
|
|
continue;
|
|
|
|
prev_format = ctx->hw_imgfmt;
|
|
|
|
// Stupidity: VOs export imgfmt only, so subfmt is always 0. Remove it
|
|
|
|
// to fix it up.
|
|
|
|
for (int i = 0; i < p->num_imgfmts; i++) {
|
|
|
|
if (p->imgfmts[i] != ctx->hw_imgfmt)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int count = p->num_imgfmts;
|
|
|
|
MP_TARRAY_REMOVE_AT(p->imgfmts, count, i);
|
|
|
|
count = p->num_imgfmts;
|
|
|
|
MP_TARRAY_REMOVE_AT(p->subfmts, count, i);
|
|
|
|
p->num_imgfmts -= 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (int i = 0; ctx->supported_formats[i]; i++)
|
|
|
|
mp_autoconvert_add_imgfmt(c, ctx->hw_imgfmt, ctx->supported_formats[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
p->vo_convert = true;
|
|
|
|
}
|
|
|
|
|
2018-01-18 13:44:20 +00:00
|
|
|
void mp_autoconvert_add_afmt(struct mp_autoconvert *c, int afmt)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
|
|
|
|
MP_TARRAY_APPEND(p, p->afmts, p->num_afmts, afmt);
|
|
|
|
p->force_update = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_autoconvert_add_chmap(struct mp_autoconvert *c, struct mp_chmap *chmap)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
|
|
|
|
mp_chmap_sel_add_map(&p->chmaps, chmap);
|
|
|
|
p->force_update = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_autoconvert_add_srate(struct mp_autoconvert *c, int rate)
|
|
|
|
{
|
|
|
|
struct priv *p = c->f->priv;
|
|
|
|
|
|
|
|
MP_TARRAY_APPEND(p, p->srates, p->num_srates, rate);
|
|
|
|
// Some other API we call expects a 0-terminated sample rates array.
|
|
|
|
MP_TARRAY_GROW(p, p->srates, p->num_srates);
|
|
|
|
p->srates[p->num_srates] = 0;
|
|
|
|
p->force_update = true;
|
|
|
|
}
|
|
|
|
|
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 10:53:44 +00:00
|
|
|
static void handle_video_frame(struct mp_filter *f)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
struct mp_frame frame = p->sub.frame;
|
|
|
|
if (frame.type != MP_FRAME_VIDEO) {
|
|
|
|
MP_ERR(p, "video input required!\n");
|
|
|
|
mp_filter_internal_mark_failed(f);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mp_image *img = frame.data;
|
|
|
|
|
|
|
|
if (p->force_update)
|
|
|
|
p->in_imgfmt = p->in_subfmt = 0;
|
|
|
|
|
|
|
|
if (img->imgfmt == p->in_imgfmt && img->params.hw_subfmt == p->in_subfmt) {
|
|
|
|
mp_subfilter_continue(&p->sub);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mp_subfilter_drain_destroy(&p->sub)) {
|
|
|
|
p->in_imgfmt = p->in_subfmt = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
p->in_imgfmt = img->params.imgfmt;
|
|
|
|
p->in_subfmt = img->params.hw_subfmt;
|
|
|
|
p->force_update = false;
|
|
|
|
|
|
|
|
bool different_subfmt = false;
|
|
|
|
|
|
|
|
for (int n = 0; n < p->num_imgfmts; n++) {
|
|
|
|
bool samefmt = img->params.imgfmt == p->imgfmts[n];
|
|
|
|
bool samesubffmt = img->params.hw_subfmt == p->subfmts[n];
|
|
|
|
if (samefmt && !samesubffmt)
|
|
|
|
different_subfmt = true;
|
|
|
|
if (samefmt && (samesubffmt || !p->subfmts[n])) {
|
|
|
|
mp_subfilter_continue(&p->sub);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mp_stream_info *info = mp_filter_find_stream_info(f);
|
|
|
|
|
|
|
|
struct mp_filter *conv = mp_filter_create(f, &convert_filter);
|
|
|
|
mp_filter_add_pin(conv, MP_PIN_IN, "in");
|
|
|
|
mp_filter_add_pin(conv, MP_PIN_OUT, "out");
|
|
|
|
|
|
|
|
struct mp_filter *filters[2] = {0};
|
|
|
|
bool need_sws = true;
|
|
|
|
|
|
|
|
int *fmts = p->imgfmts;
|
|
|
|
int num_fmts = p->num_imgfmts;
|
|
|
|
|
|
|
|
// Source is sw, all targets are hw -> try to upload.
|
|
|
|
bool sw_to_hw = !IMGFMT_IS_HWACCEL(img->imgfmt);
|
|
|
|
for (int n = 0; n < num_fmts; n++)
|
|
|
|
sw_to_hw &= IMGFMT_IS_HWACCEL(fmts[n]);
|
|
|
|
|
|
|
|
if (sw_to_hw && num_fmts > 0) {
|
|
|
|
// We can probably use this! Very lazy and very approximate.
|
|
|
|
struct mp_hwupload *upload = mp_hwupload_create(conv, fmts[0]);
|
|
|
|
if (upload) {
|
|
|
|
MP_INFO(p, "HW-uploading to %s\n", mp_imgfmt_to_name(fmts[0]));
|
|
|
|
filters[1] = upload->f;
|
|
|
|
fmts = upload->upload_fmts;
|
|
|
|
num_fmts = upload->num_upload_fmts;
|
|
|
|
}
|
|
|
|
} else if (p->vo_convert && different_subfmt && info && info->hwdec_devs) {
|
|
|
|
for (int n = 0; subfmt_converters[n].hw_imgfmt; n++) {
|
|
|
|
if (subfmt_converters[n].hw_imgfmt == img->imgfmt) {
|
|
|
|
MP_INFO(p, "Using HW sub-conversion.\n");
|
|
|
|
filters[1] = subfmt_converters[n].create(conv);
|
|
|
|
if (filters[1]) {
|
|
|
|
need_sws = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (need_sws) {
|
|
|
|
// Create a new conversion filter.
|
|
|
|
struct mp_sws_filter *sws = mp_sws_filter_create(conv);
|
|
|
|
if (!sws) {
|
|
|
|
MP_ERR(p, "error creating conversion filter\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
int out = mp_sws_find_best_out_format(img->imgfmt, fmts, num_fmts);
|
|
|
|
if (!out) {
|
|
|
|
MP_ERR(p, "can't find video conversion for %s/%s\n",
|
|
|
|
mp_imgfmt_to_name(img->imgfmt),
|
|
|
|
mp_imgfmt_to_name(img->params.hw_subfmt));
|
|
|
|
talloc_free(conv);
|
|
|
|
mp_filter_internal_mark_failed(f);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out == img->imgfmt) {
|
|
|
|
// Can happen if hwupload goes to same format.
|
|
|
|
talloc_free(sws->f);
|
|
|
|
} else {
|
|
|
|
sws->out_format = out;
|
|
|
|
MP_INFO(p, "Converting %s -> %s\n", mp_imgfmt_to_name(img->imgfmt),
|
|
|
|
mp_imgfmt_to_name(sws->out_format));
|
|
|
|
filters[0] = sws->f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_chain_filters(conv->ppins[0], conv->ppins[1], filters, 2);
|
|
|
|
|
|
|
|
p->sub.filter = conv;
|
|
|
|
mp_subfilter_continue(&p->sub);
|
|
|
|
}
|
|
|
|
|
2018-01-18 13:44:20 +00:00
|
|
|
static void handle_audio_frame(struct mp_filter *f)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
struct mp_frame frame = p->sub.frame;
|
|
|
|
if (frame.type != MP_FRAME_AUDIO) {
|
|
|
|
MP_ERR(p, "audio input required!\n");
|
|
|
|
mp_filter_internal_mark_failed(f);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mp_aframe *aframe = frame.data;
|
|
|
|
|
|
|
|
int afmt = mp_aframe_get_format(aframe);
|
|
|
|
int srate = mp_aframe_get_rate(aframe);
|
|
|
|
struct mp_chmap chmap = {0};
|
|
|
|
mp_aframe_get_chmap(aframe, &chmap);
|
|
|
|
|
|
|
|
if (afmt == p->in_afmt && srate == p->in_srate &&
|
|
|
|
mp_chmap_equals(&chmap, &p->in_chmap) &&
|
|
|
|
(!p->resampling_forced || p->sub.filter) &&
|
|
|
|
!p->force_update)
|
|
|
|
{
|
|
|
|
goto cont;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mp_subfilter_drain_destroy(&p->sub))
|
|
|
|
return;
|
|
|
|
|
|
|
|
p->in_afmt = afmt;
|
|
|
|
p->in_srate = srate;
|
|
|
|
p->in_chmap = chmap;
|
|
|
|
p->force_update = false;
|
|
|
|
|
|
|
|
int out_afmt = 0;
|
|
|
|
int best_score = 0;
|
|
|
|
for (int n = 0; n < p->num_afmts; n++) {
|
|
|
|
int score = af_format_conversion_score(p->afmts[n], afmt);
|
|
|
|
if (!out_afmt || score > best_score) {
|
|
|
|
best_score = score;
|
|
|
|
out_afmt = p->afmts[n];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!out_afmt)
|
|
|
|
out_afmt = afmt;
|
|
|
|
|
|
|
|
// (The p->srates array is 0-terminated already.)
|
|
|
|
int out_srate = af_select_best_samplerate(srate, p->srates);
|
|
|
|
if (out_srate <= 0)
|
|
|
|
out_srate = p->num_srates ? p->srates[0] : srate;
|
|
|
|
|
|
|
|
struct mp_chmap out_chmap = chmap;
|
|
|
|
if (p->chmaps.num_chmaps) {
|
|
|
|
if (!mp_chmap_sel_adjust(&p->chmaps, &out_chmap))
|
|
|
|
out_chmap = p->chmaps.chmaps[0]; // violently force fallback
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out_afmt == p->in_afmt && out_srate == p->in_srate &&
|
|
|
|
mp_chmap_equals(&out_chmap, &p->in_chmap) && !p->resampling_forced)
|
|
|
|
{
|
|
|
|
goto cont;
|
|
|
|
}
|
|
|
|
|
|
|
|
MP_VERBOSE(p, "inserting resampler\n");
|
|
|
|
|
|
|
|
struct mp_swresample *s = mp_swresample_create(f, NULL);
|
|
|
|
if (!s)
|
|
|
|
abort();
|
|
|
|
|
|
|
|
s->out_format = out_afmt;
|
|
|
|
s->out_rate = out_srate;
|
|
|
|
s->out_channels = out_chmap;
|
|
|
|
|
|
|
|
p->sub.filter = s->f;
|
|
|
|
|
|
|
|
cont:
|
|
|
|
|
|
|
|
if (p->sub.filter) {
|
|
|
|
struct mp_filter_command cmd = {
|
|
|
|
.type = MP_FILTER_COMMAND_SET_SPEED_RESAMPLE,
|
|
|
|
.speed = p->audio_speed,
|
|
|
|
};
|
|
|
|
mp_filter_command(p->sub.filter, &cmd);
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_subfilter_continue(&p->sub);
|
|
|
|
}
|
|
|
|
|
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 10:53:44 +00:00
|
|
|
static void process(struct mp_filter *f)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
if (!mp_subfilter_read(&p->sub))
|
|
|
|
return;
|
|
|
|
|
|
|
|
struct mp_frame frame = p->sub.frame;
|
|
|
|
|
|
|
|
if (!mp_frame_is_signaling(frame)) {
|
|
|
|
if (p->num_imgfmts) {
|
|
|
|
handle_video_frame(f);
|
|
|
|
return;
|
|
|
|
}
|
2018-01-18 13:44:20 +00:00
|
|
|
if (p->num_afmts || p->num_srates || p->chmaps.num_chmaps ||
|
|
|
|
p->resampling_forced)
|
|
|
|
{
|
|
|
|
handle_audio_frame(f);
|
|
|
|
return;
|
|
|
|
}
|
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 10:53:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_subfilter_continue(&p->sub);
|
|
|
|
}
|
|
|
|
|
2018-01-18 13:44:20 +00:00
|
|
|
static bool command(struct mp_filter *f, struct mp_filter_command *cmd)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
if (cmd->type == MP_FILTER_COMMAND_SET_SPEED_RESAMPLE) {
|
|
|
|
p->audio_speed = cmd->speed;
|
|
|
|
// If we needed resampling once, keep forcing resampling, as it might be
|
|
|
|
// quickly changing between 1.0 and other values for A/V compensation.
|
|
|
|
if (p->audio_speed != 1.0)
|
|
|
|
p->resampling_forced = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
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 10:53:44 +00:00
|
|
|
static void reset(struct mp_filter *f)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
mp_subfilter_reset(&p->sub);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void destroy(struct mp_filter *f)
|
|
|
|
{
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
|
|
|
|
mp_subfilter_reset(&p->sub);
|
|
|
|
TA_FREEP(&p->sub.filter);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct mp_filter_info autoconvert_filter = {
|
|
|
|
.name = "autoconvert",
|
|
|
|
.priv_size = sizeof(struct priv),
|
|
|
|
.process = process,
|
2018-01-18 13:44:20 +00:00
|
|
|
.command = command,
|
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 10:53:44 +00:00
|
|
|
.reset = reset,
|
|
|
|
.destroy = destroy,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct mp_autoconvert *mp_autoconvert_create(struct mp_filter *parent)
|
|
|
|
{
|
|
|
|
struct mp_filter *f = mp_filter_create(parent, &autoconvert_filter);
|
|
|
|
if (!f)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
mp_filter_add_pin(f, MP_PIN_IN, "in");
|
|
|
|
mp_filter_add_pin(f, MP_PIN_OUT, "out");
|
|
|
|
|
|
|
|
struct priv *p = f->priv;
|
|
|
|
p->public.f = f;
|
|
|
|
p->log = f->log;
|
2018-01-18 13:44:20 +00:00
|
|
|
p->audio_speed = 1.0;
|
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 10:53:44 +00:00
|
|
|
p->sub.in = f->ppins[0];
|
|
|
|
p->sub.out = f->ppins[1];
|
|
|
|
|
|
|
|
return &p->public;
|
|
|
|
}
|