From patchwork Thu Jul 21 02:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Phlipot X-Patchwork-Id: 36876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2770919pzb; Wed, 20 Jul 2022 19:25:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uCVbj+AujpYrx6XF3D/GCtkCKhaVc9Bu1u1UtEyXVp8zXVYv3UwZMmW+avxQOGfm4AI+TA X-Received: by 2002:a05:6402:3486:b0:43a:9b82:6d8a with SMTP id v6-20020a056402348600b0043a9b826d8amr56062769edc.23.1658370353533; Wed, 20 Jul 2022 19:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658370353; cv=none; d=google.com; s=arc-20160816; b=0O8gR8wcFnLZLci8d9FSJ/B8KZVBWfL38UjohVtOwCIjcNJ+EskC9tZ7usIstkgLTH R1Onuvg5uHyCe6dp1DlB6HUAykji5fiVeCegUztGvt21UIrLkGKSJf+RHhiwUzuDauUr yPIeNNfhuixDZvhVP+iZJ2NdaaayhtkJ+rvKe+aknk/oncYoO4FQTyQ53TWaPvv5Zk/Q X0xNft7XfJ8SZt2UBAmxEeY0d+0+tgedtRHGZqxHzKApzHsmEzf1XjuBgvqSrpKVIChK oitSmq/MYHIiJ1QMtRoYiMcrUVR3XJ/aZT9AFCFHe32kvGnztIgrCM2kA2cqXuHFlORx 8JEQ== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=e8Ovz2Yu0LrounZV3v0jaKAWXfiFfHGcrxZn1Hzu2n4=; b=qcQSlSsGyMIbnae2GkJ6O9yT+Eexnw9RwScerGGo77iBsZdF4zMHP/U36AhWYBsllO iZlzQ80SLX1+rtXxbiivHf9MIGOOKWoKjLMIShEez7k614xb3vcX3mgyZIyRhGCLBNZF e1nThrQXTF4aH+FBr7Gs48uHnhPPZumGCYxsz+iZEdqclwXijihjMXDg7xxf6GRKXm5Y QEse3qVfPi5WlD0Uqu7Q6dNfNAvpCUxlokWbw+3VPyaj//RiTFGzQYoYhQ5jv8C0arPo HCu6k8A69Xi/mZg35xS3d4Vu/XTo8eAE+c5QXQapP1NmPVCMyjYxQfOpZpNXbNasocnJ u+LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=g+XtXBEb; 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 b11-20020a1709062b4b00b007111f8df172si936391ejg.271.2022.07.20.19.25.52; Wed, 20 Jul 2022 19:25:53 -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=20210112 header.b=g+XtXBEb; 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 901A568B49A; Thu, 21 Jul 2022 05:25:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73B1C68818E for ; Thu, 21 Jul 2022 05:25:42 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id r186so378112pgr.2 for ; Wed, 20 Jul 2022 19:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=O87wVmR7M7BeqGWY6sT2yeYJi/0sVKg81MI7tuW4Rjs=; b=g+XtXBEbpMRCOKy2D/y+W+Dvdlj3uHp/Erjxr49Mo8CxwZJjXteL1IoLU5pk/2qoTF MW4oaYkclMIA0DE8jNuKk0d+mklKfR6u6CIl1QowKkxtNXSK9B9+qy0sUyleaCQAngQR v7HjelycwckLtyjFW4H4i8v6lsyMwaOmCQGM6NGyr+WQFb4lk9AIDBhbXvmOf5QQEcWg xomXmVk6W022dulUVrNi2t+qb1wMbPWD1WWTgd7zwb5gYiid+oN95/bTb+XhNC6B4Kqo Oy+Fmp7Vm+NJSXxOYisaq3Mxdi2BgifLDFwJuzWFO91KwNnxGxvu/cKi3VOVoNUsOUSB 3pNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=O87wVmR7M7BeqGWY6sT2yeYJi/0sVKg81MI7tuW4Rjs=; b=D2pLwk20LZEUn0yd9cnxRmEzC8OscGCBCpgVL7sVgqm5zr6Il+uas/0EBAFGqvQZK0 lRn6n6is4iIvqMJ8XNnHzQuSWwWmmzf+q0h4H8tPwgrtCIMzhmbdV+j8oez7l3ZFmoW0 EugoHsyiShWs/LyL9OD2soclhw6VOURitbCRdxo+8DmZSr/KHtWYZngkEj7dJ+WL/svI QYInbFStY91nY/sJAoqR0Tew38fOABE02zpmBQkkKpx4XUzPJYlod4k+LymVtBkw8yS9 ZmLOuMB3WZvXMfZTWNKWjuyCiz/BYFAGXA8l2dGEY4qGRWxqq3OQcFRf09vNVNJeg+tb tPRw== X-Gm-Message-State: AJIora9O/lvT5RMQFVoXU1F4YsTlYmPQ/7i63cSYzTqRqUi8kLAMld0N ubiQxk9whtXqddqem8D2HwkM6nsRKsO5qA== X-Received: by 2002:a05:6a00:ad4:b0:52b:5db8:f36c with SMTP id c20-20020a056a000ad400b0052b5db8f36cmr23235712pfl.18.1658370339958; Wed, 20 Jul 2022 19:25:39 -0700 (PDT) Received: from localhost.localdomain (23-121-159-29.lightspeed.sntcca.sbcglobal.net. [23.121.159.29]) by smtp.googlemail.com with ESMTPSA id j3-20020a62c503000000b005251c6fbd0csm340079pfg.29.2022.07.20.19.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 19:25:39 -0700 (PDT) From: Chris Phlipot To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 19:25:10 -0700 Message-Id: <20220721022514.1466331-1-cphlipot0@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] avfilter/vf_yadif: Fix edge size when MAX_ALIGN is < 4 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: Chris Phlipot Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F/ylrg2uh9i8 If alignment is set to less than 4 filter_edges will produce incorrect output and not filter the entire edge. To fix this, make sure that the edge size is at least 3. Signed-off-by: Chris Phlipot --- libavfilter/vf_yadif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index afa4d1d53d..055327d7a4 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -120,7 +120,7 @@ static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1, uint8_t *prev2 = parity ? prev : cur ; uint8_t *next2 = parity ? cur : next; - const int edge = MAX_ALIGN - 1; + const int edge = FFMAX(MAX_ALIGN - 1, 3); int offset = FFMAX(w - edge, 3); /* Only edge pixels need to be processed here. A constant value of false @@ -169,7 +169,7 @@ static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1, uint16_t *prev2 = parity ? prev : cur ; uint16_t *next2 = parity ? cur : next; - const int edge = MAX_ALIGN / 2 - 1; + const int edge = FFMAX(MAX_ALIGN / 2 - 1, 3); int offset = FFMAX(w - edge, 3); mrefs /= 2;