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/trim.c | |
parent | d53d48c7993fe2e9ffcc4a638ebd2f4c5273c144 (diff) |
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/trim.c')
-rw-r--r-- | libavfilter/trim.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 261dacbc5c..c260da3a0b 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -195,7 +195,6 @@ static const AVFilterPad trim_inputs[] = { .filter_frame = trim_filter_frame, .config_props = config_input, }, - { NULL } }; static const AVFilterPad trim_outputs[] = { @@ -203,7 +202,6 @@ static const AVFilterPad trim_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, - { NULL } }; const AVFilter ff_vf_trim = { @@ -212,8 +210,8 @@ const AVFilter ff_vf_trim = { .init = init, .priv_size = sizeof(TrimContext), .priv_class = &trim_class, - .inputs = trim_inputs, - .outputs = trim_outputs, + FILTER_INPUTS(trim_inputs), + FILTER_OUTPUTS(trim_outputs), }; #endif // CONFIG_TRIM_FILTER @@ -350,7 +348,6 @@ static const AVFilterPad atrim_inputs[] = { .filter_frame = atrim_filter_frame, .config_props = config_input, }, - { NULL } }; static const AVFilterPad atrim_outputs[] = { @@ -358,7 +355,6 @@ static const AVFilterPad atrim_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, }, - { NULL } }; const AVFilter ff_af_atrim = { @@ -367,7 +363,7 @@ const AVFilter ff_af_atrim = { .init = init, .priv_size = sizeof(TrimContext), .priv_class = &atrim_class, - .inputs = atrim_inputs, - .outputs = atrim_outputs, + FILTER_INPUTS(atrim_inputs), + FILTER_OUTPUTS(atrim_outputs), }; #endif // CONFIG_ATRIM_FILTER |