From patchwork Thu May 7 11:25:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 19533 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 664F344B2CA for ; Thu, 7 May 2020 14:25:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41502689F6E; Thu, 7 May 2020 14:25:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59077689F6E for ; Thu, 7 May 2020 14:25:39 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id ED96F5C00CF for ; Thu, 7 May 2020 07:25:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 07 May 2020 07:25:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=s/VUXtgFfytcW9ZlVxzUXilKq4 MfgRaHq6n9ENY+/7U=; b=GdSMkzT/G8KwjecYTIXRaJ7uqEE+KKZljLO0YZPIKQ +5yywvZWDIGpZWcIC2wd6ovkZtd9YajEOlID3QCKq/1IZxptSmT/uwf/VO+VIGMa gLiKv+28OqiEx4TFQgDvoJ0+0X+Tq+0zB5w/uWXHcIVgQtbPPoEUKcANmmZQL+g0 G/Lr6PWv83gfPw1/7geqT7v6W38Jaa7I8s0ABw3tfYLWGzaATVTlN6IY+LefwxOV RJiQUeZOQ8JzLIRC2qtYMKl3g89ahHsH9xaxoVvOCj9GkZWjnnr8G1eVxgQlc/yb ytWcQOB7fHoQKQqAHxNNpXSjAszCIBbFBWHnkq/7H1xA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=s/VUXtgFfytcW9ZlV xzUXilKq4MfgRaHq6n9ENY+/7U=; b=EQPaaMu1+DqrwwXyrMCb5nZaQjGW0UmCp kKhzRIat/2fb4f4d3bGczcmVehI4u+FNAP+8U5e/DSTEOG1i02tK36ZfTglysl1K 83mPzsBRMy1AMhpIBdt8qgO6K7u62sCg8oILqQhDB23PR9gicbi2EiT3GtqFeYP6 ZUfGrSZunvD0+dvp7bZbX6QXaOs7amgk9e+uyslaPv1t5uvgYqE14Zqs2KFodyfI bOelYZj8O/ZHXolPAjYRHLaxl3wGGEKtKpcOppT/LqeD5pfbZyAUI1R9pCB0/K1H QF+cDyiKG4QxueMOqndjOHi/RMDM9q1X8GG2ysSWtfBaMJou0zPnQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkedtgdefkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeflohhshhcuuggvucfmohgtkhcuoehjohhshhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhepudefheffheehuefhvdeutefhueeiueffgfeigf duteelhfegteehgfefgfdthedunecukfhppeekuddruddtgedrjeekrdduhedunecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhhsehith grnhhimhhulhdrlhhi X-ME-Proxy: Received: from localhost.localdomain (cpc107625-sotn16-2-0-cust150.15-1.cable.virginm.net [81.104.78.151]) by mail.messagingengine.com (Postfix) with ESMTPA id E03A6328006E for ; Thu, 7 May 2020 07:25:36 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 12:25:34 +0100 Message-Id: <20200507112535.24582-1-josh@itanimul.li> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] swscale: fix NEON hscale init 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The NEON hscale function only supports X8 filter sizes and should only be selected when these are being used. Signed-off-by: Josh de Kock --- libswscale/aarch64/swscale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index 54a3beabe8..eecbea88ca 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -34,7 +34,10 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) int cpu_flags = av_get_cpu_flags(); if (have_neon(cpu_flags)) { - if (c->srcBpc == 8 && c->dstBpc <= 14) { + if (c->srcBpc == 8 && c->dstBpc <= 14 && + (c->hLumFilterSize % 8) == 0 && + (c->hChrFilterSize % 8) == 0) + { c->hyScale = c->hcScale = ff_hscale_8_to_15_neon; } if (c->dstBpc == 8) {