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/f_metadata.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libavfilter/f_metadata.c') diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index d0a78b00d0..cecfe62a9c 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -373,7 +373,6 @@ static const AVFilterPad ainputs[] = { .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, }, - { NULL } }; static const AVFilterPad aoutputs[] = { @@ -381,7 +380,6 @@ static const AVFilterPad aoutputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, }, - { NULL } }; const AVFilter ff_af_ametadata = { @@ -391,8 +389,8 @@ const AVFilter ff_af_ametadata = { .priv_class = &ametadata_class, .init = init, .uninit = uninit, - .inputs = ainputs, - .outputs = aoutputs, + FILTER_INPUTS(ainputs), + FILTER_OUTPUTS(aoutputs), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_AMETADATA_FILTER */ @@ -408,7 +406,6 @@ static const AVFilterPad inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, }, - { NULL } }; static const AVFilterPad outputs[] = { @@ -416,7 +413,6 @@ static const AVFilterPad outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, - { NULL } }; const AVFilter ff_vf_metadata = { @@ -426,8 +422,8 @@ const AVFilter ff_vf_metadata = { .priv_class = &metadata_class, .init = init, .uninit = uninit, - .inputs = inputs, - .outputs = outputs, + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_METADATA_FILTER */ -- cgit v1.2.3