summaryrefslogtreecommitdiff
path: root/libavfilter/avf_abitscope.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-12 13:05:31 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-20 12:53:58 +0200
commit8be701d9f7f77ff2282cc7fe6e0791ca5419de70 (patch)
treef8b71470413002e9234c6a9a7adf9d4dde3ad5eb /libavfilter/avf_abitscope.c
parentd53d48c7993fe2e9ffcc4a638ebd2f4c5273c144 (diff)
downloadffmpeg-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/avf_abitscope.c')
-rw-r--r--libavfilter/avf_abitscope.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c
index 481a218e6e..c394091b7b 100644
--- a/libavfilter/avf_abitscope.c
+++ b/libavfilter/avf_abitscope.c
@@ -248,7 +248,6 @@ static const AVFilterPad inputs[] = {
.type = AVMEDIA_TYPE_AUDIO,
.config_props = config_input,
},
- { NULL }
};
static const AVFilterPad outputs[] = {
@@ -257,7 +256,6 @@ static const AVFilterPad outputs[] = {
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
},
- { NULL }
};
const AVFilter ff_avf_abitscope = {
@@ -265,8 +263,8 @@ const AVFilter ff_avf_abitscope = {
.description = NULL_IF_CONFIG_SMALL("Convert input audio to audio bit scope video output."),
.query_formats = query_formats,
.priv_size = sizeof(AudioBitScopeContext),
- .inputs = inputs,
- .outputs = outputs,
+ FILTER_INPUTS(inputs),
+ FILTER_OUTPUTS(outputs),
.activate = activate,
.priv_class = &abitscope_class,
};