diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-12 13:05:31 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-20 12:53:58 +0200 |
| commit | 8be701d9f7f77ff2282cc7fe6e0791ca5419de70 (patch) | |
| tree | f8b71470413002e9234c6a9a7adf9d4dde3ad5eb /libavfilter/vf_mix.c | |
| parent | d53d48c7993fe2e9ffcc4a638ebd2f4c5273c144 (diff) | |
| download | ffmpeg-8be701d9f7f77ff2282cc7fe6e0791ca5419de70.tar.gz | |
avfilter/avfilter: Add numbers of (in|out)pads directly to AVFilter
Up until now, an AVFilter's lists of input and output AVFilterPads
were terminated by a sentinel and the only way to get the length
of these lists was by using avfilter_pad_count(). This has two
drawbacks: first, sizeof(AVFilterPad) is not negligible
(i.e. 64B on 64bit systems); second, getting the size involves
a function call instead of just reading the data.
This commit therefore changes this. The sentinels are removed and new
private fields nb_inputs and nb_outputs are added to AVFilter that
contain the number of elements of the respective AVFilterPad array.
Given that AVFilter.(in|out)puts are the only arrays of zero-terminated
AVFilterPads an API user has access to (AVFilterContext.(in|out)put_pads
are not zero-terminated and they already have a size field) the argument
to avfilter_pad_count() is always one of these lists, so it just has to
find the filter the list belongs to and read said number. This is slower
than before, but a replacement function that just reads the internal numbers
that users are expected to switch to will be added soon; and furthermore,
avfilter_pad_count() is probably never called in hot loops anyway.
This saves about 49KiB from the binary; notice that these sentinels are
not in .bss despite being zeroed: they are in .data.rel.ro due to the
non-sentinels.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_mix.c')
| -rw-r--r-- | libavfilter/vf_mix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index cbcd82f238..a581dfc8ef 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -353,7 +353,6 @@ static const AVFilterPad outputs[] = { .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, }, - { NULL } }; #if CONFIG_MIX_FILTER @@ -365,7 +364,7 @@ const AVFilter ff_vf_mix = { .priv_size = sizeof(MixContext), .priv_class = &mix_class, .query_formats = query_formats, - .outputs = outputs, + FILTER_OUTPUTS(outputs), .init = init, .uninit = uninit, .activate = activate, @@ -432,7 +431,6 @@ static const AVFilterPad inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .filter_frame = tmix_filter_frame, }, - { NULL } }; AVFILTER_DEFINE_CLASS(tmix); @@ -443,8 +441,8 @@ const AVFilter ff_vf_tmix = { .priv_size = sizeof(MixContext), .priv_class = &tmix_class, .query_formats = query_formats, - .outputs = outputs, - .inputs = inputs, + FILTER_OUTPUTS(outputs), + FILTER_INPUTS(inputs), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |