From patchwork Thu Jun 23 10:52:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 36393 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3389884pzb; Thu, 23 Jun 2022 03:53:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tEuxlQCk/oJc+R/HbeZ/RKBj5x1J17Tl/IqgEBUZ/TMLN+Yhr0Hgr+Bv1l9k88CxO8C3dm X-Received: by 2002:a05:6402:1e95:b0:42a:c466:52ad with SMTP id f21-20020a0564021e9500b0042ac46652admr9894948edf.340.1655981584502; Thu, 23 Jun 2022 03:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655981584; cv=none; d=google.com; s=arc-20160816; b=nvFoKso5dgDsIwydSpyXw1bpWMvWslkXo6n9l9m+YTjkwypqHS6zB7mYPvuKiQpo3r VArFKejgKx6pFmSnH69klB1ysvKOSRdUJGS1WwEduFGfLSai87N8Pr5wFtxB1DbLHH+F CWE3ctNWcKEQgLDL/5sVoTZHLSqJbk/DUhGAk68chCzztDjWnRTmY/TKK1815q8oBn8D YyBv2tSVv4tGpPs7iusfX/g6Bx7XpJBECtwZk/AEQsfI0urzBOwiUzdYNRTNcEyQjYK/ r/CQENFrfGQjoxVrw7MdajlVm3B52OO9SFfxz86BbdCMXV3CQzLWX/ZUioK7qHAK1UJr yYXg== 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:feedback-id :dkim-signature:dkim-signature:delivered-to; bh=MFdAhRBJnjMT9zRTIRBLEHEWbEX9Q+XTlElVvop7qQ0=; b=qJlicQeYBUfwUWAvsTx0eqs0hSKowkS1pA0LjDeDM9tQGrqtTDy1U4WlkBwVKUYDLJ STPFbJDQoPYicRfuZjowcy4LknStbv3S3Ah0B1zKG4JIJoEdGKCf/DsHjOVfn0nUaGQo Rn8Mwy4a9JWi3bZGzkgMAKJUZrHtavl6bOpYATkYYT3dZlnwOtIBE+GlThyIIXV1+QY3 rJF217BTUTeMrIWTNY32b9wZ5+McTicu9s+IaQML+ggdWG0uiWH9w+M4vAtwoCIgdlgl lFq8lcfaCmgfcGpYfyoRtiWv10JRbMVjvJzlXDb8wz/P2qE74TI1f9kG7zQebtG8FQtK P9xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm3 header.b=mnhIvQ8T; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=unHibfOT; 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 bt4-20020a0564020a4400b004356afc7003si17031336edb.169.2022.06.23.03.53.03; Thu, 23 Jun 2022 03:53:04 -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=mnhIvQ8T; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=unHibfOT; 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 A901768B41C; Thu, 23 Jun 2022 13:52:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (unknown [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 119C068B583 for ; Thu, 23 Jun 2022 13:52:53 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BB4225C00E3 for ; Thu, 23 Jun 2022 06:52:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 23 Jun 2022 06:52:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t=1655981570; x=1656067970; bh=ujI/Bj0Ru0Hse6u5oaPFUL3Yy xjuYrlF+TWzM6/DarI=; b=mnhIvQ8Tot1CZCTOKSInl+OzGxKD6OcSh0FZSRtj/ 5PPcJ0q7N8sq6GhpfDHoC1pHBeJvbWq7Ubj/kSGAzVhjabZ3Cg5SwlW2o1Z8JuJ4 5cSCE17gggLPYwZizHrBL6cwjczjAfDw8HEE3+lCBK8CYqL/q9OeL4N63vCXpx6u 6goreAsqqlX3sk4RA5CbjGpFcTzqXmSETYqZlRcetsC7F1j2zLWW8N3TO7JhJzbj kDSCPyWvaLbJNWW4PAFw6qNNXG2P2DdsMRmNYNQfKn+4dfAuGUOLLGJUd0slivOk MPMt/3dvCqy5dwL4wap//MB1F34w6/kD4QRf542b/E7pQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1655981570; x=1656067970; bh=ujI/Bj0Ru0Hse6u5oaPFUL3YyxjuYrlF+TW zM6/DarI=; b=unHibfOTAEdF7j2LU7co0jGeXAK3SHS2BzsXk7ZmHD6RW7rN03i IrU9q/IpTEPYtqWzAa51lbt8ajp6Jy4n9uBb/7G0dabX74QjneXxRalmScQgT79G GxPwl9sL6oMljuc7hXFPV6O/ayfs1bizVPY0BPaQs7dVc3IzgWi31QHdqRWf9Pym F0PVTepNf3rjJMbUGtTxPCDE1/u0eMrJmfnPyJ8I2FSSt5mgcZxKNxv4ERqpecU1 q68mM8ty16o8qwAdeAWKO9CRdDjCkfyGH7MxYZFAWxNWU4Jxey9QlSFjZNMCcGDP TnD50D66qQCB2LMxl4sdFJ2UjsL79xK/T7w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefjedgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehjuggvkhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhephfeftdeiteeijeeigeevfeevheduleevveetje ekveeiueekjeevhffhteejtefhnecuffhomhgrihhnpehnvghonhdrshgsnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehithgrnh himhhulhdrlhhi X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 23 Jun 2022 06:52:49 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 12:52:47 +0200 Message-Id: <20220623105247.19580-1-jdek@itanimul.li> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/aarch64: add hevc chroma loop filter 8-12bit 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: DqJ/3e2pIbj5 Signed-off-by: J. Dekker --- libavcodec/aarch64/Makefile | 3 +- libavcodec/aarch64/hevcdsp_deblock_neon.S | 168 ++++++++++++++++++++++ libavcodec/aarch64/hevcdsp_init_aarch64.c | 14 ++ 3 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 libavcodec/aarch64/hevcdsp_deblock_neon.S Passes FATE, I never completed the checkasm for loop_filter, working on that currently alongside the luma loop filter. This asm can also go into hevcdsp_sao_neon.S if you would prefer not creating an extra file for it. diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index c8935f205e..66bd8b596c 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -63,6 +63,7 @@ NEON-OBJS-$(CONFIG_VP9_DECODER) += aarch64/vp9itxfm_16bpp_neon.o \ aarch64/vp9lpf_neon.o \ aarch64/vp9mc_16bpp_neon.o \ aarch64/vp9mc_neon.o -NEON-OBJS-$(CONFIG_HEVC_DECODER) += aarch64/hevcdsp_idct_neon.o \ +NEON-OBJS-$(CONFIG_HEVC_DECODER) += aarch64/hevcdsp_deblock_neon.o \ + aarch64/hevcdsp_idct_neon.o \ aarch64/hevcdsp_init_aarch64.o \ aarch64/hevcdsp_sao_neon.o diff --git a/libavcodec/aarch64/hevcdsp_deblock_neon.S b/libavcodec/aarch64/hevcdsp_deblock_neon.S new file mode 100644 index 0000000000..d21ad0a54f --- /dev/null +++ b/libavcodec/aarch64/hevcdsp_deblock_neon.S @@ -0,0 +1,168 @@ +/* -*-arm64-*- + * vim: syntax=arm64asm + * + * Copyright (c) 2014 Seppo Tomperi + * Copyright (c) 2022 J. Dekker + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#include "libavutil/aarch64/asm.S" +#include "neon.S" + +.macro hevc_loop_filter_chroma_start bitdepth + ldr w14, [x2] + ldr w15, [x2, #4] +.if \bitdepth > 8 + lsl w14, w14, #(\bitdepth - 8) + lsl w15, w15, #(\bitdepth - 8) +.endif + adds w2, w14, w15 + b.eq 1f + dup v16.4h, w14 + dup v17.4h, w15 + trn1 v16.2d, v16.2d, v17.2d +.if \bitdepth == 10 + mvni v19.8h, #0xFC, lsl #8 // movi #0x03FF +.endif +.if \bitdepth == 12 + mvni v19.8h, #0xF0, lsl #8 // movi #0x0FFF +.endif +.if \bitdepth > 8 + movi v18.8h, #0 +.endif + neg v17.8h, v16.8h +.endm + +.macro hevc_loop_filter_chroma_body bitdepth +.if \bitdepth <= 8 + uxtl v0.8h, v0.8b // p1 + uxtl v1.8h, v1.8b // p0 + uxtl v2.8h, v2.8b // q0 + uxtl v3.8h, v3.8b // q1 +.endif + sub v5.8h, v2.8h, v1.8h // q0 - p0 + sub v6.8h, v0.8h, v3.8h // p1 - q1 + shl v5.8h, v5.8h, #2 + add v5.8h, v6.8h, v5.8h + srshr v5.8h, v5.8h, #3 + smin v5.8h, v5.8h, v16.8h + smax v5.8h, v5.8h, v17.8h + sqadd v1.8h, v1.8h, v5.8h // p0 + delta + sqsub v2.8h, v2.8h, v5.8h // q0 - delta +.if \bitdepth <= 8 + sqxtun v1.8b, v1.8h + sqxtun v2.8b, v2.8h +.else + smin v1.8h, v1.8h, v19.8h + smin v2.8h, v2.8h, v19.8h + smax v1.8h, v1.8h, v18.8h + smax v2.8h, v2.8h, v18.8h +.endif +.endm + +.macro hevc_h_loop_filter_chroma bitdepth +function ff_hevc_h_loop_filter_chroma_\bitdepth\()_neon, export=1 + hevc_loop_filter_chroma_start \bitdepth + sub x0, x0, x1, lsl #1 +.if \bitdepth > 8 + ld1 {v0.8h}, [x0], x1 + ld1 {v1.8h}, [x0], x1 + ld1 {v2.8h}, [x0], x1 + ld1 {v3.8h}, [x0] +.else + ld1 {v0.8b}, [x0], x1 + ld1 {v1.8b}, [x0], x1 + ld1 {v2.8b}, [x0], x1 + ld1 {v3.8h}, [x0] +.endif + hevc_loop_filter_chroma_body \bitdepth + sub x0, x0, x1, lsl #1 +.if \bitdepth > 8 + st1 {v1.8h}, [x0], x1 + st1 {v2.8h}, [x0] +.else + st1 {v1.8b}, [x0], x1 + st1 {v2.8b}, [x0] +.endif +1: ret +endfunc +.endm + +.macro hevc_v_loop_filter_chroma bitdepth +function ff_hevc_v_loop_filter_chroma_\bitdepth\()_neon, export=1 + hevc_loop_filter_chroma_start \bitdepth +.if \bitdepth > 8 + sub x0, x0, #8 + ld1 {v20.8h}, [x0], x1 + ld1 {v21.8h}, [x0], x1 + ld1 {v0.8h}, [x0], x1 + ld1 {v1.8h}, [x0], x1 + ld1 {v2.8h}, [x0], x1 + ld1 {v3.8h}, [x0], x1 + ld1 {v22.8h}, [x0], x1 + ld1 {v23.8h}, [x0], x1 + transpose_8x8H v20, v21, v0, v1, v2, v3, v22, v23, v24, v25 +.else + sub x0, x0, #4 + ld1 {v20.8b}, [x0], x1 + ld1 {v21.8b}, [x0], x1 + ld1 {v0.8b}, [x0], x1 + ld1 {v1.8b}, [x0], x1 + ld1 {v2.8b}, [x0], x1 + ld1 {v3.8b}, [x0], x1 + ld1 {v22.8b}, [x0], x1 + ld1 {v23.8b}, [x0], x1 + transpose_8x8B v20, v21, v0, v1, v2, v3, v22, v23, v24, v25 +.endif + hevc_loop_filter_chroma_body \bitdepth + sub x0, x0, x1, lsl #3 +.if \bitdepth > 8 + transpose_8x8H v20, v21, v0, v1, v2, v3, v22, v23, v24, v25 + st1 {v20.8h}, [x0], x1 + st1 {v21.8h}, [x0], x1 + st1 {v0.8h}, [x0], x1 + st1 {v1.8h}, [x0], x1 + st1 {v2.8h}, [x0], x1 + st1 {v3.8h}, [x0], x1 + st1 {v22.8h}, [x0], x1 + st1 {v23.8h}, [x0] +.else + xtn v0.8b, v0.8h // restore + xtn v3.8b, v3.8h + transpose_8x8B v20, v21, v0, v1, v2, v3, v22, v23, v24, v25 + st1 {v20.8b}, [x0], x1 + st1 {v21.8b}, [x0], x1 + st1 {v0.8b}, [x0], x1 + st1 {v1.8b}, [x0], x1 + st1 {v2.8b}, [x0], x1 + st1 {v3.8b}, [x0], x1 + st1 {v22.8b}, [x0], x1 + st1 {v23.8b}, [x0] +.endif +1: ret +endfunc +.endm + +hevc_h_loop_filter_chroma 8 +hevc_h_loop_filter_chroma 10 +hevc_h_loop_filter_chroma 12 + +hevc_v_loop_filter_chroma 8 +hevc_v_loop_filter_chroma 10 +hevc_v_loop_filter_chroma 12 diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 2002530266..3502edb77a 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -25,6 +25,12 @@ #include "libavutil/aarch64/cpu.h" #include "libavcodec/hevcdsp.h" +void ff_hevc_v_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); +void ff_hevc_v_loop_filter_chroma_10_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); +void ff_hevc_v_loop_filter_chroma_12_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); +void ff_hevc_h_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); +void ff_hevc_h_loop_filter_chroma_10_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); +void ff_hevc_h_loop_filter_chroma_12_neon(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q); void ff_hevc_add_residual_4x4_8_neon(uint8_t *_dst, int16_t *coeffs, ptrdiff_t stride); void ff_hevc_add_residual_4x4_10_neon(uint8_t *_dst, int16_t *coeffs, @@ -67,6 +73,8 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) if (!have_neon(av_get_cpu_flags())) return; if (bit_depth == 8) { + c->hevc_h_loop_filter_chroma = ff_hevc_h_loop_filter_chroma_8_neon; + c->hevc_v_loop_filter_chroma = ff_hevc_v_loop_filter_chroma_8_neon; c->add_residual[0] = ff_hevc_add_residual_4x4_8_neon; c->add_residual[1] = ff_hevc_add_residual_8x8_8_neon; c->add_residual[2] = ff_hevc_add_residual_16x16_8_neon; @@ -89,6 +97,8 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_16x16_8_neon; } if (bit_depth == 10) { + c->hevc_h_loop_filter_chroma = ff_hevc_h_loop_filter_chroma_10_neon; + c->hevc_v_loop_filter_chroma = ff_hevc_v_loop_filter_chroma_10_neon; c->add_residual[0] = ff_hevc_add_residual_4x4_10_neon; c->add_residual[1] = ff_hevc_add_residual_8x8_10_neon; c->add_residual[2] = ff_hevc_add_residual_16x16_10_neon; @@ -100,4 +110,8 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct_16x16_dc_10_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_10_neon; } + if (bit_depth == 12) { + c->hevc_h_loop_filter_chroma = ff_hevc_h_loop_filter_chroma_12_neon; + c->hevc_v_loop_filter_chroma = ff_hevc_v_loop_filter_chroma_12_neon; + } }