From patchwork Fri Apr 23 12:52:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1504210iob; Fri, 23 Apr 2021 05:53:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQsOntvzU/DYnj68BDHA1niNSH7bRCK/tNYMO7c0qGAC80xUK5CX74U97uphL7Etu8vhAb X-Received: by 2002:a05:6402:1912:: with SMTP id e18mr4417007edz.184.1619182399863; Fri, 23 Apr 2021 05:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619182399; cv=none; d=google.com; s=arc-20160816; b=hOY2Y7AB1ccpbfQd87kRrhTnQ55G3FZYpmCC2gJbhQkF3We968GATjGd25vUZyJKLs gj4OmuNHan3EBW+W3FgIKPgIPQL3ieuTa1jprEJTuvRpl5jPjCVmV+2PpYq8tw8IAF85 bibyn5RID7BMD31rAREcOhcxQOz15SkobcW7Al+spb5UAXEgfdMoQKF9sar5wZBqN/RA 7R2e9LXiM7oDl7KWzbUA6IIlxDZqfIxaKyimYKao2GFfoXX0jY8MdcWAMX3bM/ca5c9b 4gtCSWgQZLNzvGiBfcEvZ+OfOm49Vj+WvZIRa/uPKPBwmSzS7C5zsF8Tz0WdthVqLaoH iNKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=c0vfj28uQ53nu6g6YlxFxTHusonG4YwbQHFwilsmSLQ=; b=xOpmS6EhP4HlNAkNkleZWUifF3rNOGCqenYDE0VCxgYBVSVFyl3c4KFS2a4qaeKAje aV2vLgf8jgSpD4K7jvz20RvCQlgkXmQ1OOgB6YxOjYwy4hQ0qAJ4eCjKPB0ND7fHAQBb Clv/Oxp/otTm1wtYnaVdG/RQx3RE2JdJpego897SKpzbT5igU/HIZnIFTN9lSSDzO3M5 JLoh4GiiN+m4gbfN/ZLYRTA/hoGjIDoxHmIJs7uTXvIAVN3txqVkIyLnV9tCpgNkBsZz FyWUslHcoz2SFmDdu0zeDBzrQmV/pz5htgOlg7/wU1lsJd+G++a3jP6FxhqZIlsgDSQ1 LdGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eZ7HvYnX; 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 a62si4714056edf.180.2021.04.23.05.53.19; Fri, 23 Apr 2021 05:53:19 -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=eZ7HvYnX; 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 3F347689753; Fri, 23 Apr 2021 15:53:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CD0368065D for ; Fri, 23 Apr 2021 15:53:08 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id x11so49371910qkp.11 for ; Fri, 23 Apr 2021 05:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=PdFV88e7Yc5A3HjkHIUIgRKOmhcsT2gb84VFseSj7GY=; b=eZ7HvYnXzYQt5b6WhY2Lr6xu1zcZnZoLNxuCHIIwJRZGZtf5gY61VR+M81ehjslg2d NR2olCda7V0l2AY02vdL9r3vJqtcqIkq2BxZsWR5hqfI97sIg8TmBxQTvIXrALmciewq VJR2zUc6nKvmhBv0IG+chwDO/R87riTIazH3OqbnCb0t3pkkAwcgrqTqWsHmQNUYC5ni 5KeIxU8+ywqaygfoGDyHCKChZ2X/naQj8u9kRczoGmpPwd1aH7zG8lhXBP0jYf1eWksK 1rMZLslp8rLm3mqTD+iwe1qRjF5JH0cXzmAEXC5akwo3vZDNjenEswUWnkBd36UgbN2G vOcg== 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:mime-version :content-transfer-encoding; bh=PdFV88e7Yc5A3HjkHIUIgRKOmhcsT2gb84VFseSj7GY=; b=TV6EF0Ld8NdcL0qplydy0lQbUJDD3GGde5nP15S864AcBaW3D11bKxKASayEOVRWWP NX1TRc8kIcUydNd+mVZtuEiZz6XVcbeUV3Wujvl0Jyao+zCrPl0ME6lW8+Ikla38cSCN 2k288T+mb3/wC3m+2qtsISZT9R82LNHl9XYkf/etnBaskGRTfpU0Y07gfU/BhC+L80pk 9vk1nKW8WPsG5nCv5fQ2NoRvbKxHUyRHHcYElt3oTY4VicmXHKPcYr5TkfdCrnykf+IL p7b0JbTIUh1ouyXZrvAKzOulHF4LUxYfabk2NfDerEWvBqBMvmvSa8bmZWFOqIQKJtLy DU1Q== X-Gm-Message-State: AOAM532QPgnNVYxqv72HlraI/9yn8oNo1XKp7wluHBk+lDs95lDDzDv6 EPxdsP6WzbFXqc1AdJKpCc/8Bpovysk= X-Received: by 2002:ae9:e8c6:: with SMTP id a189mr3936016qkg.463.1619182386441; Fri, 23 Apr 2021 05:53:06 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.38]) by smtp.gmail.com with ESMTPSA id m22sm4385147qtg.67.2021.04.23.05.53.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 05:53:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Apr 2021 09:52:44 -0300 Message-Id: <20210423125245.586-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/af_adelay: make per channel delay argument an int64_t X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LDutpfXZ5CVq Should fix ticket #9196 Signed-off-by: James Almer --- libavfilter/af_adelay.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index 6ac81c2a3e..1229bf5bc7 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -28,9 +28,9 @@ #include "internal.h" typedef struct ChanDelay { - int delay; - unsigned delay_index; - unsigned index; + int64_t delay; + size_t delay_index; + size_t index; uint8_t *samples; } ChanDelay; @@ -152,7 +152,7 @@ static int config_input(AVFilterLink *inlink) p = NULL; - ret = av_sscanf(arg, "%d%c", &d->delay, &type); + ret = av_sscanf(arg, "%"SCNd64"%c", &d->delay, &type); if (ret != 2 || type != 'S') { div = type == 's' ? 1.0 : 1000.0; if (av_sscanf(arg, "%f", &delay) != 1) { @@ -194,6 +194,9 @@ static int config_input(AVFilterLink *inlink) if (!d->delay) continue; + if (d->delay > SIZE_MAX) + return AVERROR(ENOMEM); + d->samples = av_malloc_array(d->delay, s->block_align); if (!d->samples) return AVERROR(ENOMEM);