virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

avfilter/avfilter: Add numbers of (in|out)pads directly to AVFilter

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt
2021-08-12 13:05:31 +02:00
parent d53d48c799
commit 8be701d9f7
389 changed files with 906 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/vf_datascope.c
View File

@@ -438,7 +438,6 @@ static const AVFilterPad inputs[] = {
.filter_frame = filter_frame,
.config_props = config_input,
},
{ NULL }
};
static const AVFilterPad outputs[] = {
@@ -447,7 +446,6 @@ static const AVFilterPad outputs[] = {
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
},
{ NULL }
};
const AVFilter ff_vf_datascope = {
@@ -456,8 +454,8 @@ const AVFilter ff_vf_datascope = {
.priv_size = sizeof(DatascopeContext),
.priv_class = &datascope_class,
.query_formats = query_formats,
.inputs = inputs,
.outputs = outputs,
FILTER_INPUTS(inputs),
FILTER_OUTPUTS(outputs),
.flags = AVFILTER_FLAG_SLICE_THREADS,
.process_command = process_command,
};
@@ -728,7 +726,6 @@ static const AVFilterPad pixscope_inputs[] = {
.filter_frame = pixscope_filter_frame,
.config_props = pixscope_config_input,
},
{ NULL }
};
static const AVFilterPad pixscope_outputs[] = {
@@ -736,7 +733,6 @@ static const AVFilterPad pixscope_outputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
},
{ NULL }
};
const AVFilter ff_vf_pixscope = {
@@ -745,8 +741,8 @@ const AVFilter ff_vf_pixscope = {
.priv_size = sizeof(PixscopeContext),
.priv_class = &pixscope_class,
.query_formats = query_formats,
.inputs = pixscope_inputs,
.outputs = pixscope_outputs,
FILTER_INPUTS(pixscope_inputs),
FILTER_OUTPUTS(pixscope_outputs),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
.process_command = pixscope_process_command,
};
@@ -1134,7 +1130,6 @@ static const AVFilterPad oscilloscope_inputs[] = {
.filter_frame = oscilloscope_filter_frame,
.config_props = oscilloscope_config_input,
},
{ NULL }
};
static const AVFilterPad oscilloscope_outputs[] = {
@@ -1142,7 +1137,6 @@ static const AVFilterPad oscilloscope_outputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
},
{ NULL }
};
const AVFilter ff_vf_oscilloscope = {
@@ -1152,8 +1146,8 @@ const AVFilter ff_vf_oscilloscope = {
.priv_class = &oscilloscope_class,
.query_formats = query_formats,
.uninit = oscilloscope_uninit,
.inputs = oscilloscope_inputs,
.outputs = oscilloscope_outputs,
FILTER_INPUTS(oscilloscope_inputs),
FILTER_OUTPUTS(oscilloscope_outputs),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
.process_command = oscilloscope_process_command,
};