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/f_drawgraph.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/f_drawgraph.c')
-rw-r--r-- | libavfilter/f_drawgraph.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index 70701e330e..a9b47483ad 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -458,7 +458,6 @@ static const AVFilterPad drawgraph_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, }, - { NULL } }; static const AVFilterPad drawgraph_outputs[] = { @@ -468,7 +467,6 @@ static const AVFilterPad drawgraph_outputs[] = { .config_props = config_output, .request_frame = request_frame, }, - { NULL } }; const AVFilter ff_vf_drawgraph = { @@ -479,8 +477,8 @@ const AVFilter ff_vf_drawgraph = { .query_formats = query_formats, .init = init, .uninit = uninit, - .inputs = drawgraph_inputs, - .outputs = drawgraph_outputs, + FILTER_INPUTS(drawgraph_inputs), + FILTER_OUTPUTS(drawgraph_outputs), }; #endif // CONFIG_DRAWGRAPH_FILTER @@ -496,7 +494,6 @@ static const AVFilterPad adrawgraph_inputs[] = { .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, }, - { NULL } }; static const AVFilterPad adrawgraph_outputs[] = { @@ -506,7 +503,6 @@ static const AVFilterPad adrawgraph_outputs[] = { .config_props = config_output, .request_frame = request_frame, }, - { NULL } }; const AVFilter ff_avf_adrawgraph = { @@ -517,7 +513,7 @@ const AVFilter ff_avf_adrawgraph = { .query_formats = query_formats, .init = init, .uninit = uninit, - .inputs = adrawgraph_inputs, - .outputs = adrawgraph_outputs, + FILTER_INPUTS(adrawgraph_inputs), + FILTER_OUTPUTS(adrawgraph_outputs), }; #endif // CONFIG_ADRAWGRAPH_FILTER |