From 71c7e9c5f48bb11c7f79a1d4f75fdc0bb3fd7c96 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 11 Feb 2024 00:04:11 +0100 Subject: [PATCH] avfilter/avfilter: Reorder structure fields Move related fields closer together and try to plug holes. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.h | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 1182af2825..25bb915f88 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -441,6 +441,13 @@ struct AVFilterContext { */ int thread_type; + /** + * Max number of threads allowed in this filter instance. + * If <= 0, its value is ignored. + * Overrides global number of threads set per filter graph. + */ + int nb_threads; + struct AVFilterCommand *command_queue; char *enable_str; ///< enable expression string @@ -461,13 +468,6 @@ struct AVFilterContext { */ AVBufferRef *hw_device_ctx; - /** - * Max number of threads allowed in this filter instance. - * If <= 0, its value is ignored. - * Overrides global number of threads set per filter graph. - */ - int nb_threads; - /** * Ready status of the filter. * A non-0 value means that the filter needs activating; @@ -548,26 +548,12 @@ struct AVFilterLink { enum AVMediaType type; ///< filter media type + int format; ///< agreed upon media format + /* These parameters apply only to video */ int w; ///< agreed upon image width int h; ///< agreed upon image height AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio - /* These parameters apply only to audio */ - int sample_rate; ///< samples per second - - int format; ///< agreed upon media format - - /** - * Define the time base used by the PTS of the frames/samples - * which will pass through this link. - * During the configuration stage, each filter is supposed to - * change only the output timebase, while the timebase of the - * input link is assumed to be an unchangeable property. - */ - AVRational time_base; - - AVChannelLayout ch_layout; ///< channel layout of current buffer (see libavutil/channel_layout.h) - /** * For non-YUV links, these are respectively set to fallback values (as * appropriate for that colorspace). @@ -578,6 +564,19 @@ struct AVFilterLink { enum AVColorSpace colorspace; ///< agreed upon YUV color space enum AVColorRange color_range; ///< agreed upon YUV color range + /* These parameters apply only to audio */ + int sample_rate; ///< samples per second + AVChannelLayout ch_layout; ///< channel layout of current buffer (see libavutil/channel_layout.h) + + /** + * Define the time base used by the PTS of the frames/samples + * which will pass through this link. + * During the configuration stage, each filter is supposed to + * change only the output timebase, while the timebase of the + * input link is assumed to be an unchangeable property. + */ + AVRational time_base; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and