From patchwork Wed Nov 17 04:56:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 31455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp211195iob; Tue, 16 Nov 2021 20:56:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjBWWFrYZECHr7DHEUsd/Pier1KL3/3nEsxznP1ir5H5iApTUu/JbP+J+7MbsuGv5VIjgs X-Received: by 2002:a17:907:7f18:: with SMTP id qf24mr17410344ejc.568.1637124993667; Tue, 16 Nov 2021 20:56:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637124993; cv=none; d=google.com; s=arc-20160816; b=JabWaCLI6i8OoS/gFU5xUYy4HKra6YxJmupz6zo0Kh0jH9pmnZnJ4yz4ug/igF0Wsi v2t3S9gsquVN7wr12QxQCO3S4P90xC3zLdFJ/n8nhtnLrM8jw18gCI3nngX+FvOtLQin /l55vjg58TNmYhauH0MdSvitL3IdJf4lTR0Dd2yLseFXbQJs2I9eqDRgU77aJe3FonPd 0lPQoig2qObsACxdCrbPT8eurO+mvfdNv5/lDfrEVuLMqx2KmCivwCmikyxCffPu0AKs TnpB37bZwv+RP9oZOtVMWvl9jcbBqjAp86c0mXiOJTGd7zPJ0DjngbXN0UwZt2Ma29zx 154g== 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=ZRqdBu/eNF8ZAbwoClKNBjdW59/FnEgBGsx3oXIDzmY=; b=S/Flg2zxbbMtDihbHynRGdHCH+wp0imfzIQzw/lOdesQiW0F8Nk+LiBFJbk8BEn13s Thu3atTGb55IDHjUYdJyWzbf6Oiyk0QuoxM330ZzyuCfNxhmXchfEesKOI5VD4uD1vgB SsxAwypzicU27C4YvTPIUuC6wfyvyJYEbCGIJb7/VjO0cCfgWMh93EP2Zj+6Z+YHZ6ik z28DGpwKQ4ASTXYEMgf7PAo9QaNiu4PFTOx9MEPbc3GLlfyQ6Rjcu/fKdEVJUQWo43wM 2lIdSI7aSaIR52ZAVJAXTMJYFD3stJK2TmmNyqXnodxxQOV89AbxbycC1QIK4F25VzLd ZRFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=inwK68Oi; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=keEgDWKN; 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 s20si34607518ejb.327.2021.11.16.20.56.32; Tue, 16 Nov 2021 20:56:33 -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=inwK68Oi; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=keEgDWKN; 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 7449668AD15; Wed, 17 Nov 2021 06:56:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EF046804B9 for ; Wed, 17 Nov 2021 06:56:20 +0200 (EET) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id AEE223201D34 for ; Tue, 16 Nov 2021 23:56:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 16 Nov 2021 23:56:17 -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=BC8H1jZnGQSaybfHwKKIiqOJ2b k0LMgDCcaa1CPmea4=; b=inwK68OimtxERAFkCe1qEzwZiOcxqIaZHfDGCanV17 ADdjq3h/1gkB81Qa6/DxssVzD5qPcvd/TLRA2NGHpj1CjlEbfNLCe4Kn8QsZxTU6 9JJvFBILiy8fAdLJ+MwbfhrWix1rQdkymaqKPR1FzEYYoRrHgqPAxL/FtZOtB/l2 9xevyGwvFp3YHvaYPMLiURTg9tmMG9nNaGIpqC+soGMNyiaXYg5o+w9vgnlTedP5 WwQCrUL+jziE6DXJscM7c1CBHiBiMQHpsQ0lu6zKt1j0+ATD0t4ELwMZFRentC7f K+muBFJSRuc5I35olwC4eJNIOEhd1w+0x2P79DkDEaQg== 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=BC8H1jZnGQSaybfHw KKIiqOJ2bk0LMgDCcaa1CPmea4=; b=keEgDWKNtlEY+QMXa2ohTHn7CLNh8jyRM 9m51YbWJf+OWPtKZ1UJAgSU80hmxZfLWXm6jL6MRAUqN2Tp496KKks1/dCkNmPzo /DlSATF/1M1ulcSBZsGh++34aO/6K4nJrcvwrVGXMJvK2t4TVij+ehKYOjPHfpFX sICK1Rjow3P4SWigNFHqh/gBWWs5dUvj+ZQ4trEps7aQSJVzdczldaVK3mbnQnFd TxPoHELDViTk0p9nOxBnEIJdcMQJda0fM4boezEqwM7DGrTKeqfIyImsnycmDYd5 AxBITPOuonBlPfWjxrcH/+cqs9gbRZd336S9RL3xYJxvsB51bDpSA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrfeefgdejiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhulhdr lhhiqeenucggtffrrghtthgvrhhnpeeutefgtdeuvdejjeejvdetleffueehtdeftedugf elhfejueektedvvddtveeiieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 16 Nov 2021 23:56:16 -0500 (EST) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Nov 2021 05:56:09 +0100 Message-Id: <20211117045614.55251-1-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 1sW8tigen276 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(-) Updated commit message. 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;