From patchwork Thu Oct 10 11:38: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: 15686 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 4EB8A44932D for ; Thu, 10 Oct 2019 14:39:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 372A9689246; Thu, 10 Oct 2019 14:39:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62E616883AD for ; Thu, 10 Oct 2019 14:39:16 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id h4so7474755wrv.7 for ; Thu, 10 Oct 2019 04:39:16 -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=75kV//C/8IME45iX0MhGhGk4aZkGSzmsvqxMorw2VD8=; b=AsFLH8GzLqDO0pMc5zjqJFRFmhAXd9rxAVLXnzAXxM9kc/+4WCb+2cuhAw36rANkgW OMAPnBHy/Ma32zdmZqpOD/69YHY0q7tMecdIZcxMhdzbuxZGghoYBAz8a1ZA8sk6whw/ XevDl4ky9mYcUs/v/YwtA+hBLUhZimlPeKHFlgeS6tzwjd9hQlgTk9XYeNL04DJqHXsq cHcLtgEhsMZayCk8xWM3z13euukKqkmlTIhbeD+mEqjlc8wrbRFoGnoEOzSywA2BNCdm CoDAblruSmJ+SSVNqLDNcfnK0Ls4+GnxTnNVOcFW0myR+uuF1YEJjudDyf+B5LyEJ23S dq3Q== 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=75kV//C/8IME45iX0MhGhGk4aZkGSzmsvqxMorw2VD8=; b=OJ9bcEyG07FEZD01S2z8qN8+MV0GLnMqlM3o2ZrwxWiDSYIeqCGz/buFJdUyyFw9I1 BVzfqUpeBX9AIOhtN7dwqyDdw8t/HdhJq0Nv2xvRS4Ruz+9jNn6oY2Qe3g7nOECLbfcw jvsh3MOiIX6MbqXZxMhYFwoigvBH5rLfWlGIJxhMNptpolylIEGU5lGuflZdXFYJnPjq rla3I6WJqeB55aIZwiXksSM1cZgecaAv7KMRt61OSgP2AcKM+smaLyC8chJGu3+MoMm2 qJyPZn/QOs8zZkMKbzbzKGblgz2ikMC2hCZzM8GqETFcFB/EzZwwPxd6kJAjWvRZH3Ny jCMw== X-Gm-Message-State: APjAAAXHQ6JIA9P3lzOaQFm5SYyrUgFkAGVYRKV9CFBaAp6MRqXR8XzD pNNka7gFe6uqADkK3cgGD+GXfZcq X-Google-Smtp-Source: APXvYqy8jZPeQOw6PhQW7ZJEsJHAFtZEUNKY2hIuHL3u7ly/6kbvk1g8+tnkqAp5cSUAFx6NvWqqkg== X-Received: by 2002:a5d:428c:: with SMTP id k12mr8234776wrq.184.1570707555678; Thu, 10 Oct 2019 04:39:15 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id w4sm5442214wrv.66.2019.10.10.04.39.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:39:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 13:38:51 +0200 Message-Id: <20191010113851.27196-14-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 14/14] avfilter/af_atempo: 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_atempo.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 688dac5464..e4fc691abe 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -162,7 +162,7 @@ static const AVOption atempo_options[] = { OFFSET(tempo), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, YAE_ATEMPO_MIN, YAE_ATEMPO_MAX, - AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM }, + AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_RUNTIME_PARAM }, { NULL } }; @@ -328,28 +328,14 @@ static int yae_reset(ATempoContext *atempo, return 0; } -static int yae_set_tempo(AVFilterContext *ctx, const char *arg_tempo) +static int yae_update(AVFilterContext *ctx) { const AudioFragment *prev; ATempoContext *atempo = ctx->priv; - char *tail = NULL; - double tempo = av_strtod(arg_tempo, &tail); - - if (tail && *tail) { - av_log(ctx, AV_LOG_ERROR, "Invalid tempo value '%s'\n", arg_tempo); - return AVERROR(EINVAL); - } - - if (tempo < YAE_ATEMPO_MIN || tempo > YAE_ATEMPO_MAX) { - av_log(ctx, AV_LOG_ERROR, "Tempo value %f exceeds [%f, %f] range\n", - tempo, YAE_ATEMPO_MIN, YAE_ATEMPO_MAX); - return AVERROR(EINVAL); - } prev = yae_prev_frag(atempo); atempo->origin[0] = prev->position[0] + atempo->window / 2; atempo->origin[1] = prev->position[1] + atempo->window / 2; - atempo->tempo = tempo; return 0; } @@ -1189,7 +1175,12 @@ static int process_command(AVFilterContext *ctx, int res_len, int flags) { - return !strcmp(cmd, "tempo") ? yae_set_tempo(ctx, arg) : AVERROR(ENOSYS); + int ret = ff_filter_process_command(ctx, cmd, arg, res, res_len, flags); + + if (ret < 0) + return ret; + + return yae_update(ctx); } static const AVFilterPad atempo_inputs[] = {