From 9899037dc6b246f2eeb7e0255c316749372fe1ae Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 13 Sep 2011 01:46:29 +0200 Subject: lavfi: rename avfilter_all_* function names to avfilter_make_all_* A function name should tell what the function does rather than what the function returns. This also avoids possible conflicts (e.g. between a function and a public list of all supported formats), and clarifies the code. Breaks audio API/ABI, add a backward compatibility layer for video API/ABI. --- libavfilter/af_aformat.c | 6 +++--- libavfilter/af_aresample.c | 4 ++-- libavfilter/avfilter.h | 19 +++++++++++++++---- libavfilter/defaults.c | 8 ++++---- libavfilter/formats.c | 11 +++++++++-- 5 files changed, 33 insertions(+), 15 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 0eb7dfa4e2..a7aa45f0b1 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -63,9 +63,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) if (*args) \ args++; - ADD_FORMATS(avfilter_all_formats(AVMEDIA_TYPE_AUDIO), sample_format, int, formats); - ADD_FORMATS(avfilter_all_channel_layouts(), channel_layout, int64_t, chlayouts); - ADD_FORMATS(avfilter_all_packing_formats(), packing_format, int, packing); + ADD_FORMATS(avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO), sample_format, int, formats); + ADD_FORMATS(avfilter_make_all_channel_layouts(), channel_layout, int64_t, chlayouts); + ADD_FORMATS(avfilter_make_all_packing_formats(), packing_format, int, packing); return 0; diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index fa26788254..04188c854d 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -104,12 +104,12 @@ static int query_formats(AVFilterContext *ctx) return AVERROR(ENOMEM); avfilter_set_common_sample_formats(ctx, formats); - formats = avfilter_all_channel_layouts(); + formats = avfilter_make_all_channel_layouts(); if (!formats) return AVERROR(ENOMEM); avfilter_set_common_channel_layouts(ctx, formats); - formats = avfilter_all_packing_formats(); + formats = avfilter_make_all_packing_formats(); if (!formats) return AVERROR(ENOMEM); avfilter_set_common_packing_formats(ctx, formats); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 90bb4d17fb..a8426fea53 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -29,7 +29,7 @@ #include "libavutil/rational.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 40 +#define LIBAVFILTER_VERSION_MINOR 41 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -43,6 +43,9 @@ #ifndef FF_API_OLD_VSINK_API #define FF_API_OLD_VSINK_API (LIBAVUTIL_VERSION_MAJOR < 3) #endif +#ifndef FF_API_OLD_ALL_FORMATS_API +#define FF_API_OLD_ALL_FORMATS_API (LIBAVUTIL_VERSION_MAJOR < 3) +#endif #include @@ -258,20 +261,28 @@ AVFilterFormats *avfilter_make_format64_list(const int64_t *fmts); */ int avfilter_add_format(AVFilterFormats **avff, int64_t fmt); +#if FF_API_OLD_ALL_FORMATS_API /** - * Return a list of all formats supported by FFmpeg for the given media type. + * @deprecated Use avfilter_make_all_formats() instead. */ +attribute_deprecated AVFilterFormats *avfilter_all_formats(enum AVMediaType type); +#endif + +/** + * Return a list of all formats supported by FFmpeg for the given media type. + */ +AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type); /** * Return a list of all channel layouts supported by FFmpeg. */ -AVFilterFormats *avfilter_all_channel_layouts(void); +AVFilterFormats *avfilter_make_all_channel_layouts(void); /** * Return a list of all audio packing formats. */ -AVFilterFormats *avfilter_all_packing_formats(void); +AVFilterFormats *avfilter_make_all_packing_formats(void); /** * Return a format list which contains the intersection of the formats of diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index c231f75d85..79fb38d70f 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -222,10 +222,10 @@ void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats * int avfilter_default_query_formats(AVFilterContext *ctx) { - avfilter_set_common_pixel_formats(ctx, avfilter_all_formats(AVMEDIA_TYPE_VIDEO)); - avfilter_set_common_sample_formats(ctx, avfilter_all_formats(AVMEDIA_TYPE_AUDIO)); - avfilter_set_common_channel_layouts(ctx, avfilter_all_channel_layouts()); - avfilter_set_common_packing_formats(ctx, avfilter_all_packing_formats()); + avfilter_set_common_pixel_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_VIDEO)); + avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO)); + avfilter_set_common_channel_layouts(ctx, avfilter_make_all_channel_layouts()); + avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats()); return 0; } diff --git a/libavfilter/formats.c b/libavfilter/formats.c index ef58665a17..0efa1aad77 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -138,7 +138,14 @@ int avfilter_add_format(AVFilterFormats **avff, int64_t fmt) return 0; } +#if FF_API_OLD_ALL_FORMATS_API AVFilterFormats *avfilter_all_formats(enum AVMediaType type) +{ + return avfilter_make_all_formats(type); +} +#endif + +AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type) { AVFilterFormats *ret = NULL; int fmt; @@ -153,7 +160,7 @@ AVFilterFormats *avfilter_all_formats(enum AVMediaType type) return ret; } -AVFilterFormats *avfilter_all_channel_layouts(void) +AVFilterFormats *avfilter_make_all_channel_layouts(void) { static int64_t chlayouts[] = { AV_CH_LAYOUT_MONO, @@ -174,7 +181,7 @@ AVFilterFormats *avfilter_all_channel_layouts(void) return avfilter_make_format64_list(chlayouts); } -AVFilterFormats *avfilter_all_packing_formats(void) +AVFilterFormats *avfilter_make_all_packing_formats(void) { static int packing[] = { AVFILTER_PACKED, -- cgit v1.2.3