From patchwork Tue Jan 4 05:20:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 33040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp16691875iog; Mon, 3 Jan 2022 21:20:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJztm7yKTjtxBps9wHgv5xiMDmmY3FYoaI+qpL97lSt7uZ7HNKNChFSnFgwgiOG0xcqBJtbJ X-Received: by 2002:a17:906:5ada:: with SMTP id x26mr38275623ejs.720.1641273637512; Mon, 03 Jan 2022 21:20:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641273637; cv=none; d=google.com; s=arc-20160816; b=qNMhsGCumjZGBMbV7joNarpQZLBdl383vkt8jsjYduWqgW9QdI+bhIZAmz0pEDIGHC fDsra/8jTkLgGUqJQNZhMtdc3HVIwVMYWXBXvOdyQoZcqEM30HaU+voo1mSzLrbpqEJd FY95zgzVOSDx/pmMcQjS7i/1qrPuot4Izh5dePIdP05WLF5YBf0xEsGyueyb28o68ifI iX3pljgr23sTOh8gemfZzmB97jAS8zgzte46Sv1s6DOorsOHJAZnyeT5aIAVz5rbKLMF LtMJ9J1D37GMP7pto6Mygie9NQPo1IlycA27au+cvLc4uiqaHGDgNTQ17yDMwQZU59nq x+Sw== 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:dkim-signature:delivered-to; bh=RTskmvksSJYo5LKaZ2AK0Wh/6m1mdvokhWj/0Cjt3Yk=; b=R2L1/dps+qXJijWEbvDsCxe9hBqTMHrqt/rxMZ1elicbcpOHrHfYblfa7RLn0gxSzi eCv8djH1Loye2JomtVUmc02pUuOZ4CjC1D+unxClbXtLtIDHVX02lvPNSZEcMdH4f+tJ ET7BiBCEgUJFqvb+qFSirigAKRP8NiWByb+l51hsRqjbFiHv1C1HrLoVbEzxVsnCQ3Rm tfcuHaMWWwUE8QKRgiTFzxYRtCdIm96GQl6oVQ8scnfQGdFY1wdCTTgxfYGw7mdW9VRN SrETsyhuAk5o2pD5eA/PJUzuLm5wXqGopeDqLH4IoOScw6xM/S/oQqjFlAo3B2F7hVNo J5Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=g0ycuX0r; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=kDQONwpm; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c12si8023190eja.536.2022.01.03.21.20.36; Mon, 03 Jan 2022 21:20:37 -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=@itanimul.li header.s=fm3 header.b=g0ycuX0r; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=kDQONwpm; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FC9768B221; Tue, 4 Jan 2022 07:20:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFD4068B191 for ; Tue, 4 Jan 2022 07:20:25 +0200 (EET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id E588B32006F2 for ; Tue, 4 Jan 2022 00:20:22 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 04 Jan 2022 00:20:23 -0500 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=fm3; bh=IadAjFXFdknsr3grChyE2TRo6y nT1g55L5Sj9KINDmQ=; b=g0ycuX0rt4Yihfvvg5Ysi3VhzLLIDU5RZClmmvwa8m pgSpvybCOw3hB4wK2TYrDj4r5yzh0+Nq5srLZRGGLc/BsOeWUzHV/Bz2S16Z8U65 AqkdsB5SPViRE/l9ca4+D83N00fr6xe4No2lfgYWRO9LSMQUhLcctgW/yJkjRFL8 OXVA+TwAWbJaurPwnhfktLXSeJ1Z+nkNXZ2EBQIYe4GPgLbThPt4IEprtOyV1Wf4 ormVoCWMX4AbD6w9loS2DR16cT+0vE3Wtp1oCr8sW2LtDxok9f5On3xK9VwsNgCq 679AtbdOUTUqc9qJ3YMeRbjvJ8z/f3Z4HS2K9bSG/opw== 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=fm1; bh=IadAjFXFdknsr3grC hyE2TRo6ynT1g55L5Sj9KINDmQ=; b=kDQONwpmh41xFrfrkh7SfKx0Jq14Vp123 UKssqK9liOZfkQk0kEgMYbxET1Hbksr5d4gM/TOwqstWgVqWVt19DYaDVzPDnw5L sbd6mtb//dUQiBhTRnn96S9dW9yCzzCk+xypAJMKR/u/LBAR/78597ZjcWKKr4JY i/RyxdXzt2o6P/td9qEnAhLEOWj0WUMM5pCnqSL6r96j1nWumbcJh3d/rQv6Xmju qo928uVh8EtBy52T9VcsuXaeH8zXMfdlmjxgATUQ/HUYwqLmWgGxCklG+4zQGJ3C kp8wTMt1rhl11vov4NFZMQKU8b4AigB5yV4KtlWgzS59TA8iNwMmg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrudefvddgjeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhepueetgfdtuedvjeejjedvteelffeuhedtfeetud fglefhjeeukeetvddvtdevieeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhepjhguvghksehithgrnhhimhhulhdrlhhi X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 4 Jan 2022 00:20:21 -0500 (EST) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jan 2022 06:20:13 +0100 Message-Id: <20220104052018.9541-1-jdek@itanimul.li> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/6] lavc/arm: dont assign hevc_qpel functions for non-multiple of 8 widths 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: a1YCnW11vE44 The assembly is written assuming that the width is a multiple of 8. However the real issue is the functions were errorneously assigned to the 2, 4, 6 & 12 widths. This behaviour never broke the decoder as samples which trigger the functions for these widths have not been found in the wild. This relies on the mappings in ff_hevc_pel_weight[]. Signed-off-by: J. Dekker --- libavcodec/arm/hevcdsp_init_neon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) This set has already been reviewed by Martin, sending to list for transparency. diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c index 201a088dac..112edb5edd 100644 --- a/libavcodec/arm/hevcdsp_init_neon.c +++ b/libavcodec/arm/hevcdsp_init_neon.c @@ -270,7 +270,8 @@ av_cold void ff_hevc_dsp_init_neon(HEVCDSPContext *c, const int bit_depth) put_hevc_qpel_uw_neon[3][1] = ff_hevc_put_qpel_uw_h1v3_neon_8; put_hevc_qpel_uw_neon[3][2] = ff_hevc_put_qpel_uw_h2v3_neon_8; put_hevc_qpel_uw_neon[3][3] = ff_hevc_put_qpel_uw_h3v3_neon_8; - for (x = 0; x < 10; x++) { + for (x = 3; x < 10; x++) { + if (x == 4) continue; c->put_hevc_qpel[x][1][0] = ff_hevc_put_qpel_neon_wrapper; c->put_hevc_qpel[x][0][1] = ff_hevc_put_qpel_neon_wrapper; c->put_hevc_qpel[x][1][1] = ff_hevc_put_qpel_neon_wrapper;