diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 04:27:31 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-16 04:27:31 +0400 |
commit | 1cbf7fb4345a3e5b7791d483241bf4759bde4ece (patch) | |
tree | d7acd8317309e051fb240e3505f77aabe2ea0437 /libavfilter/af_aformat.c | |
parent | a48abf5e263ad7f2e68821766e7cf4d29befb58e (diff) | |
parent | 0ff0af731ce4544f84b2f748dcc699717a2df8d6 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
fate: use diff -b in oneline comparison
Add missing version bumps and APIchanges/Changelog entries.
lavfi: move buffer management function to a separate file.
lavfi: move formats-related functions from default.c to formats.c
lavfi: move video-related functions to a separate file.
fate: make smjpeg a demux test
fate: separate sierra-vmd audio and video tests
fate: separate smacker audio and video tests
libmp3lame: set supported channel layouts.
avconv: automatically insert asyncts when -async is used.
avconv: add support for audio filters.
lavfi: add asyncts filter.
lavfi: add aformat filter
lavfi: add an audio buffer sink.
lavfi: add an audio buffer source.
buffersrc: add av_buffersrc_write_frame().
buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
lavfi: rename vsrc_buffer.c to buffersrc.c
avfiltergraph: reindent
lavfi: add channel layout/sample rate negotiation.
...
Conflicts:
Changelog
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aformat.c
libavfilter/allfilters.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/src_buffer.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.h
libavutil/avutil.h
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aformat.c')
-rw-r--r-- | libavfilter/af_aformat.c | 140 |
1 files changed, 89 insertions, 51 deletions
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 0a5857ec41..c602f5ddce 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -25,72 +25,110 @@ #include "libavutil/audioconvert.h" #include "libavutil/avstring.h" -#include "avfilter.h" +#include "libavutil/opt.h" + #include "audio.h" +#include "avfilter.h" +#include "formats.h" #include "internal.h" -typedef struct { - AVFilterFormats *formats, *chlayouts, *packing; +typedef struct AFormatContext { + const AVClass *class; + + AVFilterFormats *formats; + AVFilterFormats *sample_rates; + AVFilterChannelLayouts *channel_layouts; + + char *formats_str; + char *sample_rates_str; + char *channel_layouts_str; } AFormatContext; +#define OFFSET(x) offsetof(AFormatContext, x) +#define A AV_OPT_FLAG_AUDIO_PARAM +static const AVOption options[] = { + { "sample_fmts", "A comma-separated list of sample formats.", OFFSET(formats_str), AV_OPT_TYPE_STRING, .flags = A }, + { "sample_rates", "A comma-separated list of sample rates.", OFFSET(sample_rates_str), AV_OPT_TYPE_STRING, .flags = A }, + { "channel_layouts", "A comma-separated list of channel layouts.", OFFSET(channel_layouts_str), AV_OPT_TYPE_STRING, .flags = A }, + { NULL }, +}; + +static const AVClass aformat_class = { + .class_name = "aformat filter", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +#define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc) \ +do { \ + char *next, *cur = str; \ + while (cur) { \ + type fmt; \ + next = strchr(cur, ','); \ + if (next) \ + *next++ = 0; \ + \ + if ((fmt = get_fmt(cur)) == none) { \ + av_log(ctx, AV_LOG_ERROR, "Error parsing " desc ": %s.\n", cur);\ + ret = AVERROR(EINVAL); \ + goto fail; \ + } \ + add_to_list(&list, fmt); \ + \ + cur = next; \ + } \ +} while (0) + +static int get_sample_rate(const char *samplerate) +{ + int ret = strtol(samplerate, NULL, 0); + return FFMAX(ret, 0); +} + static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) { - AFormatContext * const aformat = ctx->priv; - char *fmts_str = NULL, *fmt_str, *ptr = NULL; - int64_t fmt; + AFormatContext *s = ctx->priv; int ret; - if (!args) - goto arg_fail; - -#define ADD_FORMATS(all_formats, fmt_name, fmt_type, fmts_list) do { \ - fmts_str = av_get_token(&args, ":"); \ - if (!fmts_str || !*fmts_str) \ - goto arg_fail; \ - if (!strcmp(fmts_str, "all")) { \ - aformat->fmts_list = all_formats; \ - } else { \ - for (fmt_str = fmts_str; \ - fmt_str = av_strtok(fmt_str, ",", &ptr); fmt_str = NULL) { \ - if ((ret = ff_parse_##fmt_name((fmt_type *)&fmt, \ - fmt_str, ctx)) < 0) { \ - av_freep(&fmts_str); \ - return ret; \ - } \ - avfilter_add_format(&aformat->fmts_list, fmt); \ - } \ - } \ - av_freep(&fmts_str); \ - if (*args) \ - args++; \ -} while (0) + if (!args) { + av_log(ctx, AV_LOG_ERROR, "No parameters supplied.\n"); + return AVERROR(EINVAL); + } - 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); + s->class = &aformat_class; + av_opt_set_defaults(s); - return 0; + if ((ret = av_set_options_string(s, args, "=", ":")) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args); + return ret; + } -arg_fail: - av_log(ctx, AV_LOG_ERROR, "Invalid arguments, they must be of the form " - "sample_fmts:channel_layouts:packing_fmts\n"); - av_freep(&fmts_str); - return AVERROR(EINVAL); + PARSE_FORMATS(s->formats_str, enum AVSampleFormat, s->formats, + avfilter_add_format, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format"); + PARSE_FORMATS(s->sample_rates_str, int, s->sample_rates, avfilter_add_format, + get_sample_rate, 0, "sample rate"); + PARSE_FORMATS(s->channel_layouts_str, uint64_t, s->channel_layouts, + ff_add_channel_layout, av_get_channel_layout, 0, + "channel layout"); + +fail: + av_opt_free(s); + return ret; } static int query_formats(AVFilterContext *ctx) { - AFormatContext * const aformat = ctx->priv; + AFormatContext *s = ctx->priv; - avfilter_set_common_sample_formats (ctx, aformat->formats); - avfilter_set_common_channel_layouts(ctx, aformat->chlayouts); - avfilter_set_common_packing_formats(ctx, aformat->packing); - return 0; -} + avfilter_set_common_formats(ctx, s->formats ? s->formats : + avfilter_all_formats(AVMEDIA_TYPE_AUDIO)); + ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : + ff_all_samplerates()); + ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : + ff_all_channel_layouts()); -static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamplesref) -{ - ff_filter_samples(inlink->dst->outputs[0], insamplesref); + return 0; } AVFilter avfilter_af_aformat = { @@ -100,11 +138,11 @@ AVFilter avfilter_af_aformat = { .query_formats = query_formats, .priv_size = sizeof(AFormatContext), - .inputs = (const AVFilterPad[]) {{ .name = "default", + .inputs = (AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .filter_samples = filter_samples}, + .filter_samples = ff_null_filter_samples }, { .name = NULL}}, - .outputs = (const AVFilterPad[]) {{ .name = "default", + .outputs = (AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_AUDIO}, { .name = NULL}}, }; |