From patchwork Wed Oct 9 09:56:50 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: 15607 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 25EDA44696F for ; Wed, 9 Oct 2019 12:57:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 146E86881DE; Wed, 9 Oct 2019 12:57:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81D106881B3 for ; Wed, 9 Oct 2019 12:57:12 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id r19so1756963wmh.2 for ; Wed, 09 Oct 2019 02:57:12 -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=VBxMOlN6vyVKokN9BXfWjjrcM/+x94iYwes9GiU8LVzIv+7qKv0mpa2TbJafOvmG+w RijsepalsL2e+7azLcqld2dkC+cvG9hrgxAfnupUQJG3JpvFqXeuOizSS7uLZetuLFkO RfdgFnfGhfHkiE6AY8x+24go/QtLHOXVbPq0JV7pAR3u28d35izF/ewmk11H0E/tVQIT 5FMCF/PYQQMcz2g7Yi0UqB/c75OPewn+gUPKY913mHgQ4TB0LOGDs8SyfhtMCyAq3Bxv q5cIiu0XhBvnl+xQNE0dkfnXL0qYTu1HB0mWh2p10HkSukaM39nq80DNWgn4SoDZ6N55 CQBQ== 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=oGWJ6Yi77503IQQopvlz7ybUPIwIb0eUIxvw3SfJrYDmbz4s3SkCd3B9LkYXoH4V0j q+Fev7UvffwneJ43b1GA94t9Cq2G8uQfyai2G1301bxpwWEiOkphk7moQy3bEn7yYvJL MXKoao+T5egr1b9hfBN1tx6Sd/r8Fw5PSRVycU0553FSE5oqYx5HunfFFu8yuuVIEyVF b1tUMBHKQwTd0j4mMNcbqjWYuUTs0TMEwhsCUIS7oKlZRPl5SK8xkPz2pVIrRYr8GC0M 2g0n+eQkDlRbY5Lx8qxtl1iJmOmtAsMmDgzKjiDgUhqKlDyq6FANqIJvURjndYuIQAPv sPvQ== X-Gm-Message-State: APjAAAW500jI/OOE7pOfaZo12vX4kY+N1yBRbMZUAuBcEccAFiAVoU+E wiVGiiH3bXYQzf0D88G3UXB+qreo X-Google-Smtp-Source: APXvYqxBtmVYZUlydBoZH7tqSsmiiISf7eDxeq50kZ/lHgzL7LR1CVU87oiIMsnvwj01OouMlXQ9OQ== X-Received: by 2002:a1c:f714:: with SMTP id v20mr1988370wmh.55.1570615031641; Wed, 09 Oct 2019 02:57:11 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id s9sm1964315wme.36.2019.10.09.02.57.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 02:57:11 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 11:56:50 +0200 Message-Id: <20191009095651.2928-12-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 12/13] 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; }