From 8be701d9f7f77ff2282cc7fe6e0791ca5419de70 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 12 Aug 2021 13:05:31 +0200 Subject: 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 Signed-off-by: Andreas Rheinhardt --- libavfilter/avf_showwaves.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libavfilter/avf_showwaves.c') diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index b3639f46a5..3dd381b9fd 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -763,7 +763,6 @@ static const AVFilterPad showwaves_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, }, - { NULL } }; static const AVFilterPad showwaves_outputs[] = { @@ -772,7 +771,6 @@ static const AVFilterPad showwaves_outputs[] = { .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, }, - { NULL } }; const AVFilter ff_avf_showwaves = { @@ -782,9 +780,9 @@ const AVFilter ff_avf_showwaves = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), - .inputs = showwaves_inputs, + FILTER_INPUTS(showwaves_inputs), .activate = activate, - .outputs = showwaves_outputs, + FILTER_OUTPUTS(showwaves_outputs), .priv_class = &showwaves_class, }; @@ -877,7 +875,6 @@ static const AVFilterPad showwavespic_inputs[] = { .config_props = showwavespic_config_input, .filter_frame = showwavespic_filter_frame, }, - { NULL } }; static const AVFilterPad showwavespic_outputs[] = { @@ -887,7 +884,6 @@ static const AVFilterPad showwavespic_outputs[] = { .config_props = config_output, .request_frame = request_frame, }, - { NULL } }; const AVFilter ff_avf_showwavespic = { @@ -897,8 +893,8 @@ const AVFilter ff_avf_showwavespic = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), - .inputs = showwavespic_inputs, - .outputs = showwavespic_outputs, + FILTER_INPUTS(showwavespic_inputs), + FILTER_OUTPUTS(showwavespic_outputs), .priv_class = &showwavespic_class, }; -- cgit v1.2.3