From patchwork Wed Oct 3 15:01:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Bin X-Patchwork-Id: 10633 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp4315826uaq; Wed, 3 Oct 2018 08:02:26 -0700 (PDT) X-Google-Smtp-Source: ACcGV63fr8h4zO4xstq7cmM+MWWMgdzb+OUaiqD6Oul7ry+TrskocmZITT+NI166wV4/Z7E4gocG X-Received: by 2002:a1c:7704:: with SMTP id t4-v6mr1761806wmi.136.1538578946914; Wed, 03 Oct 2018 08:02:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538578946; cv=none; d=google.com; s=arc-20160816; b=brgZoKXjd4RvqEjdxNdCL4AJVfLosK2Pczq52SLGG9vlBl1Dj+GilXS8D0Tf/WrffG ILVbTEHxT4Rrm4P8yzsGKQZSqIkUGe1g5Cw0/hOXVQuTiOR5gYWABjfregxFBPe9Lt71 QbIIhGTOt2+tJHCDMEoO4dQ12SAzPCvPvG4Q8Sif4/6bhLxW8eGi0bIcjIt3He5dxImn t+B9UErPj/TOK/3yI8MAn+7dB6BOzcqvrxchj8Q+aKDIHvIL5Mjg63f0LldMCSjPF5uf MxgaDL6yX7RIa+MPRtC8W0595355WgIIV5PcC2jOQK9JwvnszEvej+ynxr/mHmz6uUhA QGcg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=ugz9zPIii7OqIE2PsGm7PEV6YW3tAargqZ6VIbKfjB4=; b=lsb/CnhJfmyJt8SlkZa/aHnT16HA+W15WXxgOls7/R+mwTPIdBxaA/fiBvZHOBHE0A GnwoBk/UE7617YxHqlY/BaYO8s0vceP8qEloAZwrXjilRnwV69JF/0mVCLeHva82uRMp WM+EHrsMYoNH4zIFpfs9Wdpm3oiA4Ah43gNqBwx0z0iO9sbfTFSbe0tD3lRGgljkV6Oq k1GReWFer3u+CuCYM9zu33xsFr94LCXXG8Q2/0OFZ5pg+5u5uJU+I1Xg+PVCTSXpTQu4 5BHv4TsXovYYEN65IPUjWH//67MBNr5VHzsgvYCF6rkHdy2fVZWtqq4wqwLvnfzCWnQp bzHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Qa7knX0g; 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 y13-v6si1327258wrs.372.2018.10.03.08.02.25; Wed, 03 Oct 2018 08:02:26 -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=Qa7knX0g; 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 AAEC368A40C; Wed, 3 Oct 2018 18:02:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDC0C68A0B6 for ; Wed, 3 Oct 2018 18:01:57 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id x17-v6so1824010pfh.5 for ; Wed, 03 Oct 2018 08:02:17 -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; bh=w7n+kSCw03cxVbmd3WNn5p+Uzxxk91XPGb1xlhQgvAg=; b=Qa7knX0goFBVVcUCxgGFkezx6G55yw7KEDpKCUrkdkihomuaNG1m96QSXib7mTGUSs xnmPwK+10bCB3MbSqMPwtvWo1nJAoL82HQ5mMC7TaNEJwc7zfMF0Zr8IfI4R7A1H0Tla rMWwFrUSmG7bcE/UOgAZ0SIObsluYWBavCfPnmGQoJbVqNeFrYL8xSQSctKSCh2rWj30 /ShFv21dk0D5Bay77JNTVPOy0SRWnEGQS22hB7+FMu6iTe6oO4QhOIJihCOlf2EHq5fC 1lcwKkkMhOUZwInkLXbfHNTQKRC+jdGQOYdN8lWWKrzCUL8h0diivunpE3mhaaMzqQKq ndXQ== 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; bh=w7n+kSCw03cxVbmd3WNn5p+Uzxxk91XPGb1xlhQgvAg=; b=oT2aRLvzsocULX54DllbUc93c2XKXxC6CRaShwm8oFKtrhls/Kso8cOQS3spQTjuQx PBYAEyoJpstvaV1Tv70A1iuL5JoAhVF7+ifExburgi2BbhVNIriIBxkc8YXVXNXwvV4w o7QAzq6hUrZorIErgppEdujs2A8N0BCe3h7xI+D2IkurPo2Gk+0xHWPtwwxUx0KKyqzi CpI0Tzb33+zTzrT6G/IeUJcH1XduXOjMTomiiegLzt3MTFZzto5DlhvuPNbep/JVE+2P kRX4ey8Ck3wypvt6QZ8XlE5fJpGCyw4RqOhOW4JJCYpSFqAL0oS71s8bHMQybEwyIng6 qg4g== X-Gm-Message-State: ABuFfoiGl8YE7+vMedxA/tHbS7i80k1CxkuBSvWX4qRrjeFc35JzsLzc XexqdncmncKfTR42JLZr587gnqc= X-Received: by 2002:a62:54c7:: with SMTP id i190-v6mr2020456pfb.155.1538578935632; Wed, 03 Oct 2018 08:02:15 -0700 (PDT) Received: from localhost.localdomain ([112.17.244.222]) by smtp.gmail.com with ESMTPSA id k3-v6sm8152056pfk.60.2018.10.03.08.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Oct 2018 08:02:14 -0700 (PDT) From: wbsecg1@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Oct 2018 23:01:44 +0800 Message-Id: <20181003150144.50245-1-wbsecg1@gmail.com> X-Mailer: git-send-email 2.17.1 (Apple Git-112) Subject: [FFmpeg-devel] [PATCH] lavfi/atempo: fix range check if tempo is set by 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 Cc: wang-bin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: wang-bin --- libavfilter/af_atempo.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 52f15f2769..1a004212a7 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -331,9 +331,10 @@ 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); + const AVOption *o = av_opt_find(&atempo->class, "tempo", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ); + if (tempo < o->min || tempo > o->max) { + av_log(ctx, AV_LOG_ERROR, "Tempo value %f exceeds [%.1f, %.1f] range\n", + tempo, o->min, o->max); return AVERROR(EINVAL); } @@ -439,8 +440,8 @@ static int yae_load_data(ATempoContext *atempo, return 0; } - // samples are not expected to be skipped, unless tempo is greater than 2: - av_assert0(read_size <= atempo->ring || atempo->tempo > 2.0); + // samples are not expected to be skipped: + av_assert0(read_size <= atempo->ring); while (atempo->position[0] < stop_here && src < src_end) { int src_samples = (src_end - src) / atempo->stride;