From patchwork Thu Oct 10 11:38:49 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: 15684 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 BE02244932D for ; Thu, 10 Oct 2019 14:39:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACE036883E0; Thu, 10 Oct 2019 14:39:17 +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 63EB86881F2 for ; Thu, 10 Oct 2019 14:39:14 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r3so7478862wrj.6 for ; Thu, 10 Oct 2019 04:39:14 -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=PJnYdkRWctp9bjQ6HyMK/NwvZvIpX0BhWCMgTB4OJ3w=; b=Otphyplbx1IUEzgYPfMkPVg2x5rs07MXZbRQ4FKXp5135/Bh40CIFgsQ1wHqX477HS Lgy4JGXys4pMF5Aiw0K0j+RDHxTOqII+xNUX82PBzPj6i31448IL/1qSodJqV7QmO2Js PPZT0KBW/JMKMpnsiV3dzubvRqPG4QZvxPmSYKLNuD5opOR6dEVx7Jo5FekjoRaJ6/GJ aahWOtRWFX07Th3uknxCjGSu+LGrQddhpHcLUqk9E5yANHIDRIA4lgRtpBiYgiWpJbpa //ubHYjYnSXC/ZvdAIJov2+rIl7K66IjUXqbENF6U06gT7BmxX8zX5AM6QdbH0Msh9ky gTIQ== 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=PJnYdkRWctp9bjQ6HyMK/NwvZvIpX0BhWCMgTB4OJ3w=; b=GI1JnRV7SXebEzdcj/8X2G82nARGxsHT/9ZZlYQob5Z3r27ZZ8ydgKp0jtLd/lBv31 2nm37bSdWC0uqDXnuSvFB05LrmNQREVOnRiDyjK4JZzpUdWUOW8H9XL8AQZIYg37mWQp /Wm3aM4ZvvG8HJtXQUqx2oTJw1AbPEkn4M9/MyMSLZvzBLkTPRebzh0CjnkBeQaG1VP1 ZA5XHbKAAI/o1dsS2g4CNqoBPiPUc3PhRs/B2U0ZkSm6gN3M2QOVqPPbVpEleZLsKGh8 NCdxZGU1htKrxK8neJeqYHkOAEj4PfnPqdjjztE67+dQEUSUo4KOhT3jGlt4zbX1vDg2 6b8g== X-Gm-Message-State: APjAAAWhILHNpZBu9EiHhDx6YDEhWm5uo5+lEkHY3nLR5T5CY5rZvhNz IJ8NN07yxaRD6FWn7xE1TbeGaGHB X-Google-Smtp-Source: APXvYqyqa8zMfCdenXVi9KHr46OFa5OLP09RpHMB+FHWCNoxzqZsfxH7Pyb4sI8nkB+mtuiQ/r6/dQ== X-Received: by 2002:a5d:4685:: with SMTP id u5mr8538756wrq.264.1570707553417; Thu, 10 Oct 2019 04:39:13 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id w4sm5442214wrv.66.2019.10.10.04.39.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:39:12 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 13:38:49 +0200 Message-Id: <20191010113851.27196-12-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010113851.27196-1-onemda@gmail.com> References: <20191010113851.27196-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..e002d9de17 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 AT AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_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, AT }, + { "pitch", "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, AT }, { "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; }