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_cue.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libavfilter/f_cue.c') diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index 03804f1667..e87b7a67c7 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -103,7 +103,6 @@ static const AVFilterPad cue_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, - { NULL } }; static const AVFilterPad cue_outputs[] = { @@ -111,7 +110,6 @@ static const AVFilterPad cue_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, - { NULL } }; const AVFilter ff_vf_cue = { @@ -119,8 +117,8 @@ const AVFilter ff_vf_cue = { .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), .priv_size = sizeof(CueContext), .priv_class = &cue_class, - .inputs = cue_inputs, - .outputs = cue_outputs, + FILTER_INPUTS(cue_inputs), + FILTER_OUTPUTS(cue_outputs), .activate = activate, }; #endif /* CONFIG_CUE_FILTER */ @@ -134,7 +132,6 @@ static const AVFilterPad acue_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, }, - { NULL } }; static const AVFilterPad acue_outputs[] = { @@ -142,7 +139,6 @@ static const AVFilterPad acue_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, }, - { NULL } }; const AVFilter ff_af_acue = { @@ -150,8 +146,8 @@ const AVFilter ff_af_acue = { .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), .priv_size = sizeof(CueContext), .priv_class = &acue_class, - .inputs = acue_inputs, - .outputs = acue_outputs, + FILTER_INPUTS(acue_inputs), + FILTER_OUTPUTS(acue_outputs), .activate = activate, }; #endif /* CONFIG_ACUE_FILTER */ -- cgit v1.2.3