From patchwork Thu Oct 4 05:14:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 10617 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp442104uaq; Wed, 3 Oct 2018 22:14:40 -0700 (PDT) X-Google-Smtp-Source: ACcGV63XuydHiDlyggR2H4vv50TOuoyGKltIh+UfhVSKr6DvQtE1rpxX0nEkyzIFaOIz1cmpbACX X-Received: by 2002:a1c:6c09:: with SMTP id h9-v6mr3209885wmc.95.1538630079928; Wed, 03 Oct 2018 22:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538630079; cv=none; d=google.com; s=arc-20160816; b=S5u7DGmW7fBnyavSyZFhRiwNqPbx6y7i/MzqxpKGCyb+j+NTav9LKVf+eFGr795D5E WbM5rii9OeYdcwMV5g/wFuswGy9DIvbMGyTKno0TyDSEAtRRzFxZjjiGXAAreoJMiBLJ 3vjuJ/umY0zSd+70AAu3CiESdWVx3c72ddjIzI2lMHzKvLL8ZXB5lWfeiw9ykwvdebDc uiKwVBaQK3SrdqlHzg5bfSuvLCjkbNrZkJIsO/mDoTqxMl6h2FY2NWcgt7msiaPuxVAO Bbz2mQH4A2Fx9ZZUXv9GGu+oqJUySP/22urKJVXhdFVZGetAcaeuHEwgtL3z/6EnmuxH ht+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=/3Nk1EbyRKda8Kyp8RObFSvcZo412BIsAERxmpnm1Us=; b=0A/yEPVf+evspTP8kXjZIFOQ8OKE4KpeHUQHeu0n1ZJlwy9QTmQvKNUslo+ygZHk40 GT0Z9c7sJOjawrXOKv/ObvyOMxLtVGp1TriBZe+AqXZfsXnQNtDBZdTayQYyFIzmAUZF SCmzdK4kxnioRoS5O/AT9Hq4EoE6kJMZKRsFen0yqrv8QMsFjOMz2DuXUojrv1/V8WrA iYRF3qMvWpFSjHgc/ED6fS4cXvMEEaY6lgqLlDGHZcIwGnhkUfmIkSmidPZLLsL7PcrF 8tR19Qk34Nsu02ir0WUmbZN5RwiJrGC3ZY1dTLZgQrgRoQFA9MPgtXjsSKOVYdD+T6Yk 33og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rWujoMZj; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 89-v6si3306210wrf.444.2018.10.03.22.14.39; Wed, 03 Oct 2018 22:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rWujoMZj; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7317B68A0B1; Thu, 4 Oct 2018 08:14:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 747B7689EB9 for ; Thu, 4 Oct 2018 08:14:11 +0300 (EEST) Received: by mail-yb1-f169.google.com with SMTP id e16-v6so3383016ybk.8 for ; Wed, 03 Oct 2018 22:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XAqBhLHyJcTBd0U5yfTaDpT8OVdG3DWcrNB7+XvJ8S4=; b=rWujoMZj5Uh6FBSGGuSeOtpl9JTNreKssSuq2APpyheHW2H9RAPofcBmBomTlPDg7w e6/M9Xybwsg42MUhd3PYie8AnYpgTh80j4NtpmbS8y0r6b1HOfYHJ1MiLQxWUQUuxJ3Q DpnjOk/mo0NPYTaQtjWDGNgrXDd3PP+3vHbUqldlZcbpbjgBPLlVV0PjkTsijzXG4jSU QGUqRAeCqFQc0DTky9Uiom63Ad/8r9+MrOu6H3WYkEQY9iHzaCclHSNReahqIFBRQaJu gwdRd2zTxIwwisMqwJATIkJgqyDgekO9u1azR4KOEjVcWNACzP1An9mH+OjXrmBlGE9A S8Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XAqBhLHyJcTBd0U5yfTaDpT8OVdG3DWcrNB7+XvJ8S4=; b=hdZnoDPnOVx4RhcxtJJmrpS/v1C7MQo0s5QBSDQnB83zqQ4sSlZSn6Ct2ncL3TlZ0b Zc6cKGzxEVUb+4PHRzdpi2zOTMntunwYVhlD4D0H/oByQpxnpNNUrfgNqTA9H4svf1Ew 9hTUlzF1Fsvua0gPi4jEg/jWdGYnZ9uEd9LDpDR/EJ+B5Biv3S3Y3pUdPe/VKdiVgvZF 0/Cf/G9l81zJuKhYK3ruEL3XRdUzUljq2QUO4Tm3UH6SRaRHqNs317ZgIAEiHMnWk6us 8XFM8W3qpdYkzmqQSu7Zjhi7KT9vN+aRBSEvMXVFizwfNu4VP9I8sgwiN3+RMhuvIOm1 SM8g== X-Gm-Message-State: ABuFfojxGH6cO00X8D/zkf2R9JSrHEZ7KBJqYljZuCzeuTvDPoIvCcCd FtGFStSYUDa2TuHdJsQMSYohIW2A X-Received: by 2002:a25:2d6b:: with SMTP id s43-v6mr2552463ybe.286.1538630069057; Wed, 03 Oct 2018 22:14:29 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:31e0:a83:99ef:3f5c:d5d0:bb2f]) by smtp.gmail.com with ESMTPSA id f5-v6sm1403607ywa.39.2018.10.03.22.14.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 22:14:28 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Oct 2018 23:14:19 -0600 Message-Id: <20181004051419.34261-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] lavfi/atempo: fix tempo range limit inconsistency 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 Cc: Pavel Koshevoy MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" yae_set_tempo was overlooked when max tempo limit was raised to 100. tested with: ./ffmpeg_g -i Delerium/SemanticSpaces/Gateway.mp3 \ -af asendcmd=f=asendcmd.cfg,atempo=1.0 -y /tmp/asendcmd-atempo.wav where asendcmd.cfg was: 15.0-45.0 [enter] atempo tempo 2.0, [leave] atempo tempo 0.5; 60.0-300.0 [enter] atempo tempo 4.0, [leave] atempo tempo 1.0; --- libavfilter/af_atempo.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 52f15f2769..bfdad7d76b 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -149,11 +149,16 @@ typedef struct ATempoContext { uint64_t nsamples_out; } ATempoContext; +#define YAE_ATEMPO_MIN 0.5 +#define YAE_ATEMPO_MAX 100.0 + #define OFFSET(x) offsetof(ATempoContext, x) static const AVOption atempo_options[] = { { "tempo", "set tempo scale factor", - OFFSET(tempo), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 }, 0.5, 100.0, + 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 }, { NULL } }; @@ -331,9 +336,9 @@ static int yae_set_tempo(AVFilterContext *ctx, const char *arg_tempo) return AVERROR(EINVAL); } - if (tempo < 0.5 || tempo > 2.0) { - av_log(ctx, AV_LOG_ERROR, "Tempo value %f exceeds [0.5, 2.0] range\n", - tempo); + 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); }