From patchwork Sat Oct 16 17:35:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 31133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1614357ioa; Sat, 16 Oct 2021 10:36:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZ9bd5ABI7RkKcRYmb7phnrrfCw+V2nohbTWJE1DoM0PSwbr/xjjaIf0eE/FtWHJlevy+p X-Received: by 2002:a17:907:984d:: with SMTP id jj13mr16785871ejc.211.1634405782648; Sat, 16 Oct 2021 10:36:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634405782; cv=none; d=google.com; s=arc-20160816; b=s7Lqg3UQPpLoEkPQvks4wxAvgPSnzTJSUu5v/JxhcQLUD9gfoh4g4mz7yF82NZqJYa uYGZUILpodT1Wgl8iy+DUYFG3gZYvSrBxOxC9Y2oX8FIfSWrZDoyXP3GBoswjB2tqTaW 0PYHMwY/luYPmT/9QV+kCLKQNE1uGuoflKyrAe+CP0NaGQWRdmHtXc+Uz3HpJxUhMRd6 +QT+lCXmjUM8Vwx2hWlZR/+NjVT+pgXg6fqBvugXmA1mh0bq1LlAtAHcnV1JBMj4Tnw1 WaLqLbEgfFMsSkPPmIZNuHDzJnm+FxD//jhKw3Ult9rTEGA5+WlBXo85W3W6I9lqe99k hQKg== 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:dkim-signature:delivered-to; bh=GF3JUt8GF/B3TvHE5mWsEiHVww0y60DVBw86cY2AY10=; b=KsmxA8bJyvUJjJT9YzDuY8s3rvj4ZCLZdsdwj5hvTVL12Zl406Etq43MBF13uq7GY2 icWXxKuryhYM2q1ZRGHpBKeQMJnmVBs6hqSRwt46HCxKkkNac1LDPTpNYx2yMmoorXVc LOs/RRBy6rewH4p0JMHEqV18+rH1fA8Ji8blWIFIwog84Ko34elHfHBBzx/N/dhUAJO5 ODvGe9hSnASo+GqMdW8vxdR4oTqmFhPctoOvliEQv8kTX9Og9tD4dOrcWQZZ/BPutSC9 xMzixkzGNjHJm6JCmVRTgSNRPwfK7abBFHwzZ4kKG+pvQhpIHPJvPRDO6SX72KPgZVZ8 VpVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=M3jQxWcp; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=G1ihOPXa; 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 o23si16416667ejm.475.2021.10.16.10.36.22; Sat, 16 Oct 2021 10:36:22 -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=@itanimul.li header.s=fm3 header.b=M3jQxWcp; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=G1ihOPXa; 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 B3DA968A83E; Sat, 16 Oct 2021 20:36:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B187068A618 for ; Sat, 16 Oct 2021 20:35:57 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id C91EA5C00B3; Sat, 16 Oct 2021 13:35:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 16 Oct 2021 13:35:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=LVQ8rrz/zL7Mg+gfFZmt1jC/oE CUHsa6sVLlIyGf1+c=; b=M3jQxWcpz9+zXvEjUmdUKA+rD4xUyRJFYPwdGJqq0K h1B4NHvNjtI6fcZuXpSx1IOjUNYsUOPEp+hcdBfhlk+9hhtvZeyMp2/94BkzuTLj UesjuZ0tQJ4+B/9TR+08dsLQPfwI1RwnmkjS7dOUV1kWyXhsk4u3jF+nic0CRo9w pk8iQ6xX7Sxn6DPoGZ0rjNOuOwEjwMLj5hrAZ6RkaW6ELQTE6KT3MVuB2PtENt+G MpFwlI54VjcFZK5Zy6xEWYKq4Anyy38Crb+hbcISAuM4Q5OUW6oVWkfAQP2Y9QZ2 gUn2BjLKm1CuAbo0Le66TYjQuno/ZMQctKfJ+ucNKHWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=LVQ8rrz/zL7Mg+gfF Zmt1jC/oECUHsa6sVLlIyGf1+c=; b=G1ihOPXalIpWj+3KdkJvhcbTsFg6t6WqP lfmBqgdgQhCxLnOoD18ID5Nm+hzN0A+NbH6k9wpNFqN99geuZK3Zjjd+sW4+0TKb lwhVJsZJjX+otk/7YFwqLH8LkqUrxrYc/Lur9ySbjruQgnAVcO3OT/fvaiVVEmrU cR5SdO3mJVdPCzNsnmwoUDDEHC4uNTdAk8wHhxlQCazLjeMCKafQblwue68sIbzf UFew+DS9R9h5Bk5irfxrVbEruiEYICVcLxB2DstNEf1CULbeEbQB8WEyafpJsAhD KI81tjYuiaoO3e7L1s/ocLTBKn/p4EPs3jHkTTNbnxw10uVzck33g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvdduiedguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeeutefgtdeuvdejjeejvdetleffueehtdefte dugfelhfejueektedvvddtveeiieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 16 Oct 2021 13:35:54 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Oct 2021 19:35:51 +0200 Message-Id: <20211016173552.49482-1-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/arm: dont assign hevc_qpel non-multiple of 8 width stubs 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: martin@martin.st Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eq2LdpjCDLhR Signed-off-by: J. Dekker --- libavcodec/arm/hevcdsp_init_neon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From patchwork Sat Oct 16 17:35:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 31132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1614231ioa; Sat, 16 Oct 2021 10:36:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4Oj8C0Xi2dW8jpJroAHp/oA5QmsTo5OnTkwUmb4lg4z1E7Da2zLY0EGICX4znzBxcd8Pj X-Received: by 2002:a17:906:4f19:: with SMTP id t25mr16327708eju.176.1634405770421; Sat, 16 Oct 2021 10:36:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634405770; cv=none; d=google.com; s=arc-20160816; b=KN/rASxtloTQe0MQsolveCiqLN4BCPqOM3WYLZ/9IU7IHkXdgxOoEB2rYd+i46NJr+ 0xCuQml7lWL0c0glYWknNaSHrJn3LuaNgzi8mCEM8jTRKe3IPKax0bP/3VRk7LVAaet9 05mZbSYVw7jlAhwOi0rXVTpv56ErAn9o5pYQ4zKCaOnhwG2J4+GpaRvgD7plO6AYMIOK IzodAxDIWyq+g89a2pjYM3fHgFr9b18XPYxK2Oj98CbA2i57iFic4LBgYMGa/pcWuPkd zqaIzL/Fj9gNMRuIJZQFNU2X051A7RZh1LINBea2ftNrWByxtkZhR+dBYLI6PKMrUuEb 4aqw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:dkim-signature:delivered-to; bh=RTRrqZ1ftoSbfzEn7X/ixWLdCBVCIjOY8aQltDKU2fI=; b=AqM8/I7zlWGGdleBdJOAIWaT2J+oPIuxMdVZLNPcbUqe/Su2swgu18zPpqPKCdjJHV Q1fG0GUfNs8pmomLHmiVdaVNkl4rK42knVDrUK7HejVQEDhQxX9ILRrU4S/OYrsEz682 mCmwSP/sf5jSpkICL4J/YRlYG5KNwIVIGz7lu8FuwObDQRrt01RW7vNEkaneVBN7kZdU DnSbiZGeEFbc8U2JHjk6WFfHBsPpkFFm3Dqnb3YVFlmm4wqlR0yFvXuoebKtdG6f4z0D NYiwv6U47OP7SU9hXnDJOp27FlcoxyBkV3jLDdtm9xla9esiSqnWLmZHuJu8Q9H02tA1 /GZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=LnXXt9gL; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=npcGsXNy; 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 n3si13448855eju.458.2021.10.16.10.36.09; Sat, 16 Oct 2021 10:36:10 -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=@itanimul.li header.s=fm3 header.b=LnXXt9gL; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=npcGsXNy; 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 85A7768A618; Sat, 16 Oct 2021 20:36:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE8CE68A44C for ; Sat, 16 Oct 2021 20:35:57 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8EEC15C00C9; Sat, 16 Oct 2021 13:35:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 16 Oct 2021 13:35:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=G+zNUrHwbfEjD yhXxekIs1GGBYfsVN16oW7DKykZltM=; b=LnXXt9gLaMkHe3vm8w72g+mJHV8Q0 BaMFK4U0Z4LI6oOJbBhoNxPtyHXzp1ZBLuhapJ1zxHwvqmfjLqVxlOdYm9vlAdLD e70hMAL4Dz+/2thmuXdqpsXvTU4uf1W9zf/2tALnfslzRkEn/JXNZTLbpS7mhvCw mbyEldEMeoDAjft2BCPTtvB/owzycly/bPzdRfA4d74osDWg4cPLAHe9GXTx7Gms KfCLb5QW6B+JXyv8qaQNRr1D9I3M5bF1cUtEkSoH3SOb+F4I9xrIrbHYX/YMUwEt Zv4zUHKAn96mPaJMOq1FFhOn5NgtS4qW/l1Hler0ZWLUmvd5FUIA4+V5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=G+zNUrHwbfEjDyhXxekIs1GGBYfsVN16oW7DKykZltM=; b=npcGsXNy i87x1WDVH1sCTJZ2j6cBiywRy4atElNI3VktxnxNn42X17+v6dj0xX6l3X0cvfbh J7ceDZO7sOZerxn4K+nFkoA7FvAKhYqMiSU1dEdfZ3u4Ww3oYYMNPG/QQfynlWVf roL2TpbkZBecwWSiB4tEKpJzAV1E14j0mFS3BiC2JNz749cO/APNovg4gGbzhaVx +KKc51KaIR5fC582HsyVDfEdNx8aORgykFAlrl6+CsSkzwRKoAxgTCeQXbg+kJL2 g1twmuaXL55rRvOG6CJsIRtxNGEfWwGan6RpERrFpSyzEY2RWYvD6X2qSEQZhgzY cnO+iJVyHC7pHw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvdduiedguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhi mhhulhdrlhhiqeenucggtffrrghtthgvrhhnpefhvdefjeffgefffeeifeevgfehuedule ehhfffvedttdfhheduiedtteefheeiteenucffohhmrghinhepnhgvohhnrdhssgenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjuggvkhesih htrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 16 Oct 2021 13:35:55 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Oct 2021 19:35:52 +0200 Message-Id: <20211016173552.49482-2-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20211016173552.49482-1-jdek@itanimul.li> References: <20211016173552.49482-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] Revert "arm: hevc_qpel: Fix the assembly to work with 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 Cc: martin@martin.st Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /qqdd4ratdcK This reverts commit 2589060b92eeeb944c6e2b50e38412c0c5fabcf4. Signed-off-by: J. Dekker --- libavcodec/arm/hevcdsp_qpel_neon.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/arm/hevcdsp_qpel_neon.S b/libavcodec/arm/hevcdsp_qpel_neon.S index f71bec05ed..caa6efa766 100644 --- a/libavcodec/arm/hevcdsp_qpel_neon.S +++ b/libavcodec/arm/hevcdsp_qpel_neon.S @@ -237,7 +237,7 @@ vld1.8 {d23}, [r2], r3 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #16 mov r0, r6 @@ -280,7 +280,7 @@ vld1.8 {d23}, [r2], r3 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 mov r0, r6 @@ -310,7 +310,7 @@ vld1.8 {d23}, [r2], r3 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 mov r0, r6 @@ -377,7 +377,7 @@ endfunc vst1.16 {q7}, [r0], r1 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #16 mov r0, r6 @@ -417,7 +417,7 @@ endfunc vst1.8 d0, [r0], r1 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 mov r0, r6 @@ -446,7 +446,7 @@ endfunc vst1.8 d0, [r0], r1 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 add r10, #16 @@ -533,7 +533,7 @@ endfunc \filterh q7 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #16 mov r0, r6 @@ -594,7 +594,7 @@ endfunc \filterh q7 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 mov r0, r6 @@ -641,7 +641,7 @@ endfunc \filterh q7 bne 8b subs r5, #8 - ble 99f + beq 99f mov r4, r12 add r6, #8 mov r0, r6