diff options
author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:17:20 +0200 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:18:44 +0200 |
commit | 3c2e4c2a9bacb3262bd689c7d84f8a46359b9040 (patch) | |
tree | 9776c051c5f99304030e93d1c6afeb0cbf765582 /libavfilter/avf_showwaves.c | |
parent | 38788f2de5d6d7e696a34674baa83b78e3f2ee6b (diff) |
lavfi/showwaves: switch to an AVOptions-based system.
Diffstat (limited to 'libavfilter/avf_showwaves.c')
-rw-r--r-- | libavfilter/avf_showwaves.c | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 095fc572e8..5e8914630b 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -54,35 +54,19 @@ typedef struct { #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption showwaves_options[] = { - { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, - { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "600x240"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "600x240"}, 0, 0, FLAGS }, + { "mode", "select display mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=MODE_POINT}, 0, MODE_NB-1, FLAGS, "mode"}, + { "point", "draw a point for each sample", 0, AV_OPT_TYPE_CONST, {.i64=MODE_POINT}, .flags=FLAGS, .unit="mode"}, + { "line", "draw a line for each sample", 0, AV_OPT_TYPE_CONST, {.i64=MODE_LINE}, .flags=FLAGS, .unit="mode"}, { "n", "set how many samples to show in the same point", OFFSET(n), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, - - {"mode", "select display mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=MODE_POINT}, 0, MODE_NB-1, FLAGS, "mode"}, - {"point", "draw a point for each sample", 0, AV_OPT_TYPE_CONST, {.i64=MODE_POINT}, .flags=FLAGS, .unit="mode"}, - {"line", "draw a line for each sample", 0, AV_OPT_TYPE_CONST, {.i64=MODE_LINE}, .flags=FLAGS, .unit="mode"}, + { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, + { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, { NULL }, }; AVFILTER_DEFINE_CLASS(showwaves); -static av_cold int init(AVFilterContext *ctx, const char *args) -{ - ShowWavesContext *showwaves = ctx->priv; - int err; - - showwaves->class = &showwaves_class; - av_opt_set_defaults(showwaves); - showwaves->buf_idx = 0; - - if ((err = av_set_options_string(showwaves, args, "=", ":")) < 0) - return err; - - return 0; -} - static av_cold void uninit(AVFilterContext *ctx) { ShowWavesContext *showwaves = ctx->priv; @@ -133,6 +117,7 @@ static int config_output(AVFilterLink *outlink) if (!showwaves->n) showwaves->n = FFMAX(1, ((double)inlink->sample_rate / (showwaves->w * av_q2d(showwaves->rate))) + 0.5); + showwaves->buf_idx = 0; outlink->w = showwaves->w; outlink->h = showwaves->h; outlink->sample_aspect_ratio = (AVRational){1,1}; @@ -261,7 +246,6 @@ static const AVFilterPad showwaves_outputs[] = { AVFilter avfilter_avf_showwaves = { .name = "showwaves", .description = NULL_IF_CONFIG_SMALL("Convert input audio to a video output."), - .init = init, .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), |