From patchwork Wed Oct 9 09:56:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15609 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CF47744696F for ; Wed, 9 Oct 2019 12:57:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCC2C6881EF; Wed, 9 Oct 2019 12:57:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 703E56881D1 for ; Wed, 9 Oct 2019 12:57:13 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id r5so2022223wrm.12 for ; Wed, 09 Oct 2019 02:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=kYd4f9K0vfXzMczlWXvCE+DuvzUio7HLH6mpU8e77zg=; b=S0erfcisIS+IFM+luolzdsAqFT793/mjdZw5mCq27AgG0d2kj0QbuNj5nBI5+U1U8S OOpa8br4VSmeluMcW9wB6Br8PKpT6EGcOFsZEUpwEwa1K6r6HiSsEnsuV7/M/HEzTOef VBsPnY8yK8Tslc90LEoMyUWb5z6CmGX5XFth6YcLiTXl2TPEtC1LUq3tvbAcds5EE9DW HAoE4xSAj1qoC7TY6C15AfHUhRc/I6Vy5cL3fRO3725sO7oX5atULS6Wcj+74dPsfVii 0wSQi0UkrWfh1LTbOJQL2+QZcVMZ449FFUQkIEMagTijyZQwwHzTWGZ2kDV8ryuBgqOg 0W/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=kYd4f9K0vfXzMczlWXvCE+DuvzUio7HLH6mpU8e77zg=; b=dp2ukYQLR8xN8sQ74kgqW34Qgnrk8LrNptM4Puayyh5HruVft8/BFLwyWnrw5qYPKH K1FLGMksDfKKDQHg9X/GWpZW/NuUJLkoWBDQ7CypooTvXbgcNzoi0bmddMDPOf6DY9wE CLoYOEIRYEQxDJvOPmQ3pe3/vT3QSdQFIdARszGg1/K3SJdK5C00INDoIKB6oAH5oMoE xcKE20jnamygR9OyX22GjCtbJt9rcCiwEImu4nQ4Pm+V+4BHMFfjVYRgXgVqpblY1hJH OGnjGjtABuG0yBF5qewdbmSLXZNxCj/E7why7jScd95eU0EHqCoCLM3ZbTzPWZhKLjD0 GDgQ== X-Gm-Message-State: APjAAAURRCT4sd/9fqZbs7th87DQZPv397kmSQDJPM13n9kJJ39hGpGt 9a5BxRo4Jdqs8XTMGG6Ge7pQrz2O X-Google-Smtp-Source: APXvYqyFtjz8dmV8zzMuzzVGOOotgqB/RiafgP/X+BfZwlx6TuuZoJ0e0t+R+0zUvhEdgGS+vIY3Jw== X-Received: by 2002:adf:dcc6:: with SMTP id x6mr2084479wrm.81.1570615032630; Wed, 09 Oct 2019 02:57:12 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id s9sm1964315wme.36.2019.10.09.02.57.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 02:57:12 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 11:56:51 +0200 Message-Id: <20191009095651.2928-13-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191009095651.2928-1-onemda@gmail.com> References: <20191009095651.2928-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 13/13] avfilter/af_biquads: use ff_filter_process_command() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/af_biquads.c | 133 +++------------------------------------ 1 file changed, 10 insertions(+), 123 deletions(-) diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 247a47256f..43633a9e41 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -505,125 +505,11 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar { BiquadsContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + int ret; - if ((!strcmp(cmd, "frequency") || !strcmp(cmd, "f")) && - (s->filter_type == equalizer || - s->filter_type == lowshelf || - s->filter_type == highshelf || - s->filter_type == bass || - s->filter_type == treble || - s->filter_type == bandpass || - s->filter_type == bandreject|| - s->filter_type == lowpass || - s->filter_type == highpass || - s->filter_type == allpass)) { - double freq; - - if (sscanf(args, "%lf", &freq) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid frequency value.\n"); - return AVERROR(EINVAL); - } - - s->frequency = freq; - } else if ((!strcmp(cmd, "gain") || !strcmp(cmd, "g")) && - (s->filter_type == equalizer || - s->filter_type == lowshelf || - s->filter_type == highshelf || - s->filter_type == bass || - s->filter_type == treble)) { - double gain; - - if (sscanf(args, "%lf", &gain) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid gain value.\n"); - return AVERROR(EINVAL); - } - - s->gain = av_clipd(gain, -900, 900); - } else if (!strcmp(cmd, "mix") || !strcmp(cmd, "m")) { - double mix; - - if (sscanf(args, "%lf", &mix) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid mix value.\n"); - return AVERROR(EINVAL); - } - - s->mix = av_clipd(mix, 0, 1); - } else if ((!strcmp(cmd, "width") || !strcmp(cmd, "w")) && - (s->filter_type == equalizer || - s->filter_type == lowshelf || - s->filter_type == highshelf || - s->filter_type == bass || - s->filter_type == treble || - s->filter_type == bandpass || - s->filter_type == bandreject|| - s->filter_type == lowpass || - s->filter_type == highpass || - s->filter_type == allpass)) { - double width; - - if (sscanf(args, "%lf", &width) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid width value.\n"); - return AVERROR(EINVAL); - } - - s->width = width; - } else if ((!strcmp(cmd, "width_type") || !strcmp(cmd, "t")) && - (s->filter_type == equalizer || - s->filter_type == lowshelf || - s->filter_type == highshelf || - s->filter_type == bass || - s->filter_type == treble || - s->filter_type == bandpass || - s->filter_type == bandreject|| - s->filter_type == lowpass || - s->filter_type == highpass || - s->filter_type == allpass)) { - char width_type; - - if (sscanf(args, "%c", &width_type) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid width_type value.\n"); - return AVERROR(EINVAL); - } - - switch (width_type) { - case 'h': width_type = HERTZ; break; - case 'q': width_type = QFACTOR; break; - case 'o': width_type = OCTAVE; break; - case 's': width_type = SLOPE; break; - case 'k': width_type = KHERTZ; break; - default: - av_log(ctx, AV_LOG_ERROR, "Invalid width_type value: %c\n", width_type); - return AVERROR(EINVAL); - } - - s->width_type = width_type; - } else if ((!strcmp(cmd, "a0") || - !strcmp(cmd, "a1") || - !strcmp(cmd, "a2") || - !strcmp(cmd, "b0") || - !strcmp(cmd, "b1") || - !strcmp(cmd, "b2")) && - s->filter_type == biquad) { - double value; - - if (sscanf(args, "%lf", &value) != 1) { - av_log(ctx, AV_LOG_ERROR, "Invalid biquad value.\n"); - return AVERROR(EINVAL); - } - - if (!strcmp(cmd, "a0")) - s->a0 = value; - else if (!strcmp(cmd, "a1")) - s->a1 = value; - else if (!strcmp(cmd, "a2")) - s->a2 = value; - else if (!strcmp(cmd, "b0")) - s->b0 = value; - else if (!strcmp(cmd, "b1")) - s->b1 = value; - else if (!strcmp(cmd, "b2")) - s->b2 = value; - } + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; return config_filter(outlink, 0); } @@ -654,7 +540,8 @@ static const AVFilterPad outputs[] = { }; #define OFFSET(x) offsetof(BiquadsContext, x) -#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_COMMAND_PARAM +#define AF AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM #define DEFINE_BIQUAD_FILTER(name_, description_) \ AVFILTER_DEFINE_CLASS(name_); \ @@ -810,8 +697,8 @@ static const AVOption lowpass_options[] = { {"k", "kHz", 0, AV_OPT_TYPE_CONST, {.i64=KHERTZ}, 0, 0, FLAGS, "width_type"}, {"width", "set width", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.707}, 0, 99999, FLAGS}, {"w", "set width", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.707}, 0, 99999, FLAGS}, - {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, FLAGS}, - {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, FLAGS}, + {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, + {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, {"mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, {"m", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, {"channels", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS}, @@ -834,8 +721,8 @@ static const AVOption highpass_options[] = { {"k", "kHz", 0, AV_OPT_TYPE_CONST, {.i64=KHERTZ}, 0, 0, FLAGS, "width_type"}, {"width", "set width", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.707}, 0, 99999, FLAGS}, {"w", "set width", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.707}, 0, 99999, FLAGS}, - {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, FLAGS}, - {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, FLAGS}, + {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, + {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, {"mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, {"m", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, {"channels", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS},