From patchwork Thu Mar 7 22:58:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajiv Harlalka X-Patchwork-Id: 46874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp589018pzb; Thu, 7 Mar 2024 14:59:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWSXVWSJKBFCJUwlKsNDlhDtFDx0rJcktK32rnS6dkXQt/ipFpHTJc3UnrJAI5d7hrrRN6QVixb+mKTLcpyeq7xGWE3cgH3h5Igfw== X-Google-Smtp-Source: AGHT+IG8aMT0n5QMr6SxN/rjx8LDjWrTzdsIU/3FG169b346y8fuLyDYvesiGMCR1wFhNZ0Ymb1U X-Received: by 2002:a17:906:68cc:b0:a45:c0ea:6578 with SMTP id y12-20020a17090668cc00b00a45c0ea6578mr3219589ejr.77.1709852345891; Thu, 07 Mar 2024 14:59:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709852345; cv=none; d=google.com; s=arc-20160816; b=Q8OWWh3+R5X3cTqtNpj9lvgF1p2Ic8ruMxVA76hX8LmkKW1ZKzDVpA4gwb1QsiRwQC ZMeTljY9w+USGF/O4dhk15So0j02fSngIG1s9o8pjjnZe/qPjHPUg+gs7bPwiO12IaQq 4V6MYwJTRdCi8+Mw4cEhq1Y7XYMkQBbFCz6zkzmNi2HBzQS4hcwFaGbHHXf/jWZHIyki X2V1KKZ78oe79d2RClT+5cbskwJNXVd/FNefdJAWNIP1wU1DtiycUuJ5ilmRIQvThh7T Fv7bCp5iGUPFAgccX4pNEypmblZvL9XBao3WCE2jh22vTQecmAlIi2vNKUNQyhsWJYr9 2dgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=7FOAxXg+bRxnG8P68zxxGtV8mND54v86fme+aZDcrJs=; fh=ggGUpKNcsNobFRdC5jtBTnObMykrremR7YzPE27aUHY=; b=wSvYyYuUn3zDzacTc5gSp+eYjNbEIUvDD+mNL0MdaENCBZ0K7OpF4Dv08uJJDlcwWa X1CAVfFNx2iA5gCfNBsNI5sSd/hk63JLdUqCk14JKgP4a594mi7ms8okINgErPEY3RTu VH/Z3J3ry7UCIeEUPk9tjF5IKKVN+uWEvOX5JD86xKZ63HPKz0NJp9Ls1GDatXIHi5gi fMuiEfG7LUzZK9Wh+0rh4+yfEZDGDOVy8ma1N8YhMSENOM5NzbTgkOFy6uMD+p3p1+du Pv4SLKff9jTnmNtOGfTTTLupxxYM7bMuzVG5mNN3E4NTlweLNfMn4dVbIQQLyTrgcz5K RhJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=EbGX6xwH; 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 rv4-20020a17090710c400b00a4323f62581si7038267ejb.768.2024.03.07.14.59.05; Thu, 07 Mar 2024 14:59:05 -0800 (PST) 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=20230601 header.b=EbGX6xwH; 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 97B0068CC58; Fri, 8 Mar 2024 00:59:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 442EC68CB1D for ; Fri, 8 Mar 2024 00:58:55 +0200 (EET) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-512b3b04995so1166051e87.3 for ; Thu, 07 Mar 2024 14:58:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709852334; x=1710457134; darn=ffmpeg.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Ns+dCgnuoawDDXkLa+ST/JDh0mrWze0hjfVfpMTQtrs=; b=EbGX6xwHIa0vCYx7aKcthn8hOhVmRxjBedPrn3yh7yl1GXQ+It2h8DpOCXntXTJFz1 zowIQK7T/W9jbcJ/8ZTye7CXVXz7r0jos1zJ2WeTLt5oUbswRgWqQ1FWP3XaoC+8BRko aCMK/uL0VJZ1kYBE+R1sk7DW1Yym8RioLq5BU/NzAK6lPI2S+IrxGsh2Dp+WA7OGpBha Y0qmZKlbrm6XxTzsmxkWWiFVDzLfgvKeVR4wq/gx7ZFpWi6x6jvR+xVeVsFGPPxgidVq +Lms0RRSMIrUZnML94369Hre/5Ql9JazMWBOs168bXWwopeTEkYjjwjIoY7ZAemhsHyN xPEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852334; x=1710457134; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ns+dCgnuoawDDXkLa+ST/JDh0mrWze0hjfVfpMTQtrs=; b=M8NqG1LPnhjJVJGD+rh4zMc439GryhVkeC2+LJ+jtyer7mn3UQOb/l4VbDUexxNHm0 Az70uaUJabfBJ14O02tz9BxsD+7qShaUvPt3Ka38b6ohkgyVwTiVEXBfkbhYHlsPSPpd ywfRaXAAJuDHuUdb506nqSK5HhoAU8yv9X6xDtNGf+Mu/isv6b10ZzEIKB+WgpUMOCq7 B2G/JoIX/jKZHOwwBoPXbi0RYvjmudES1/q6nRxzaOHn6xRMaRPgwgFIkZrBEHxS/AAr Olc2knjckPei74UWhRNsSyGa5jMQJQ0MUxmUemW+Uiox11jQX/8dK46U992lTC3HyRVb Ei7Q== X-Gm-Message-State: AOJu0YylYbxDoyY/f4w1Z5cOiVaAuuguD1AmUe5BByOPnIcPmvQzUCy9 jqD0uSy8TJ6AYQXgaKTbpbqe18fYl/Pw5yEEaOxSF3AUd6p6XPCe4asCMFPKqXG6OX8pEcWEzU2 Jq7M7eZjWG1QV7kXt7XKAO61E7Gt2/unHwtluDLtv X-Received: by 2002:a19:5f13:0:b0:513:32b1:9654 with SMTP id t19-20020a195f13000000b0051332b19654mr2341253lfb.25.1709852333545; Thu, 07 Mar 2024 14:58:53 -0800 (PST) MIME-Version: 1.0 From: Rajiv Harlalka Date: Fri, 8 Mar 2024 04:28:17 +0530 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] af_tempo.c: fix checking of samples and zero frame counts 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 Cc: Thilo Borgmann , cosmin@cosmin.at Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9e9HJh39fFKi Check for zeros equal to the total samples early, because in case the check is true we would already be leaving the first few frames out. Signed-off-by: Rajiv Harlalka #10692 --- libavfilter/af_atempo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 4621b67b03..8f31c5beaf 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -531,21 +531,20 @@ static int yae_load_frag(ATempoContext *atempo, dst = frag->data; start = atempo->position[0] - atempo->size; - zeros = 0; + // what we don't have we substitute with zeros: + zeros = frag->position[0] < start ? FFMIN(start - frag->position[0], (int64_t)nsamples) : 0; + + if (zeros == nsamples) { + return 0; + } if (frag->position[0] < start) { - // what we don't have we substitute with zeros: - zeros = FFMIN(start - frag->position[0], (int64_t)nsamples); av_assert0(zeros != nsamples); memset(dst, 0, zeros * atempo->stride); dst += zeros * atempo->stride; } - if (zeros == nsamples) { - return 0; - } - // get the remaining data from the ring buffer: na = (atempo->head < atempo->tail ? atempo->tail - atempo->head : -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list