From patchwork Wed Oct 9 10:17:03 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: 15624 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 E0BF8448B76 for ; Wed, 9 Oct 2019 13:17:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCDC86881D1; Wed, 9 Oct 2019 13:17:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9D396881E3 for ; Wed, 9 Oct 2019 13:17:27 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id j18so2114660wrq.10 for ; Wed, 09 Oct 2019 03:17:27 -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=aV0FvCcEFn6NbRGSXuz53YsiamuuCoQDB462yDB94jc=; b=AunWjvGusFUI+NhjdfZizrc6NdgECs6AEvAntSN6HuatzUyy12dkCDLiGAb8p4jPRT MuXdj6QzMrOO7IH/VIiPEJUg4VeOWJ/qkgjb8LmZ4fQhbckkmknJROZfiQZM7krS6LPu tQhjUPRdBSslYvFPfMGfGo1AR4INollx/1xQs+CCM5WehHfVimEasrBGwqvBw3W+OVvX 9DiIz5Bu+o4c5l7tB4yEeViRXP+ve0NJjqW9sniswy02Hs6mNv+lAQlAaJuCiNZUYted wId364J4y+5RSRVbyQT9slc378jrdgPnXEYTYIshKbhbv5rmiuxaKFeljhejDCjKkHut SJqA== 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=aV0FvCcEFn6NbRGSXuz53YsiamuuCoQDB462yDB94jc=; b=FQoYjZbDNwuayV3TRIoD8U3mUzUjByx2heByRy6zxfXbj7OtzXpxTZmUFmfpvLUmTY LZtZNyTu39zOC+GBhQzPlo2ONrv57Bz7eTC9Bjo8umzoURES+XumWhpJLquVNnneqqhA AgtMKVJO3QXhpRhzyD4lrio5bz3QmBYx7n4s9adjMMGisTyDKWvthDwE64kanEjymdpI O0a3RKShJgMCDZMJz/IXUdGRYkIepyU4VglwWnr44mKOr0r/OrMugIFCOYbphW+OHMJH vBWLxnowhVqTdHCq17mjcRjuBsyi88cTBXGor6iMClvkn5KfsZ22Zsz/7jOHgN0oYuew EFYw== X-Gm-Message-State: APjAAAW3w16sOAOPMO0qxMqavCJw4FofVmeOqyhs4M5Ign1/V2pWGrbD /RBdlv5UAVa7K0kxgoOso/NQcfXC X-Google-Smtp-Source: APXvYqy1+1VcyEyCEQocjp+8wc1WRUxCyzfjz7jfmZ7tKN0ZXgoQOejnUhBIGE4zncOs9ZwA2shREA== X-Received: by 2002:adf:dfce:: with SMTP id q14mr2141737wrn.14.1570616246945; Wed, 09 Oct 2019 03:17:26 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id z13sm1727117wrq.51.2019.10.09.03.17.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 03:17:26 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 12:17:03 +0200 Message-Id: <20191009101705.7072-12-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191009101705.7072-1-onemda@gmail.com> References: <20191009101705.7072-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 12/14] avfilter/af_rubberband: 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_rubberband.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c index ef937f4415..8db87fda1e 100644 --- a/libavfilter/af_rubberband.c +++ b/libavfilter/af_rubberband.c @@ -43,10 +43,11 @@ typedef struct RubberBandContext { #define OFFSET(x) offsetof(RubberBandContext, x) #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define C AV_OPT_FLAG_COMMAND_PARAM static const AVOption rubberband_options[] = { - { "tempo", "set tempo scale factor", OFFSET(tempo), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A }, - { "pitch", "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A }, + { "tempo", "set tempo scale factor", OFFSET(tempo), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A|C }, + { "pitch", "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A|C }, { "transients", "set transients", OFFSET(transients), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "transients" }, { "crisp", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsCrisp}, 0, 0, A, "transients" }, { "mixed", 0, 0, AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsMixed}, 0, 0, A, "transients" }, @@ -200,30 +201,14 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar char *res, int res_len, int flags) { RubberBandContext *s = ctx->priv; + int ret; - if (!strcmp(cmd, "tempo")) { - double arg; - - sscanf(args, "%lf", &arg); - if (arg < 0.01 || arg > 100) { - av_log(ctx, AV_LOG_ERROR, - "Tempo scale factor '%f' out of range\n", arg); - return AVERROR(EINVAL); - } - rubberband_set_time_ratio(s->rbs, 1. / arg); - } - - if (!strcmp(cmd, "pitch")) { - double arg; + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; - sscanf(args, "%lf", &arg); - if (arg < 0.01 || arg > 100) { - av_log(ctx, AV_LOG_ERROR, - "Pitch scale factor '%f' out of range\n", arg); - return AVERROR(EINVAL); - } - rubberband_set_pitch_scale(s->rbs, arg); - } + rubberband_set_time_ratio(s->rbs, 1. / s->tempo); + rubberband_set_pitch_scale(s->rbs, s->pitch); return 0; }