From patchwork Wed Jan 5 08:31:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 33081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp520057iog; Wed, 5 Jan 2022 00:31:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzr2KfA9gYACx8WNuHC5oF5qosWboepQ+aE8urk0ucCPSX8Y6Y6xzIjX8une8+2lUs7YsTs X-Received: by 2002:aa7:d2d1:: with SMTP id k17mr52172658edr.250.1641371488058; Wed, 05 Jan 2022 00:31:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641371488; cv=none; d=google.com; s=arc-20160816; b=Nf2aPxvjxCayNW87xmm9Zh498O24agBbvtAB5AcT2Yp0Dz5L1wa68+9dkYvO3F6BTn ZkmPkbfCtEBLsGQMUrGp7lBhqfkfvn/b2ZQ17LbDKcQO6TlRETfA3oFPzPZimUq6ng0/ cnhhFaDs8lnRiJ4SXvG//ZgNkWXCCYsYyR5/MHlgDsNBrQyTF21Sg0xymu/L6IouCH9R uX3HQoLoRdkVfosjZLZFX7oobfcoiSu5RGNnVMoYSLgo/p0P/Fr/IuAYmzJhTYyp2nl1 d9lKmN3sAFNbUXBJ2f39gEkgHEazGKdEw4IgKMsqvR8i0dlqloJBHEQolFCly9g+Gpe3 pIDQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=mTWZf9k6XhEYMuZOmFyW490di4vCn8YXKTB3XJWPrxc=; b=Cxj9zV6lHdLxBxLjAVu2fC41owAidm0+IUqy8NvwnwpINqzkZMn4db7q3dSNANZ/Q2 VzZwRZA4GIKO5lIG9fdlDYzKFnNWbXDlVzhLurnV2XchW2TEIJpGqkHbW0TgVaHIe6Jd QbyviImjjg/s4IxFJ1vLByr1m46uP0M4GhmgMXucQVMX+BxdQaMQeJgxMt5liAoGLGGi ZsSAC4SOlCH5KnqS/q2EsHoCDrvMb8QzrwDkPOV2DZ25lhwvVQTyzAB8iAoOmaSy377Q fP3/t/6FIF1zrFP71Z1BFnJ8rQoi0w2FqEhOa7booKVc2BRUaQE0+iTHrZmAJR+NkgAs YxGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=bYaGCbEB; 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 g1si22603025edb.72.2022.01.05.00.31.27; Wed, 05 Jan 2022 00:31:28 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=bYaGCbEB; 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 8EA8168A948; Wed, 5 Jan 2022 10:31:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAB1A68A940 for ; Wed, 5 Jan 2022 10:31:09 +0200 (EET) Received: by mail-lj1-f172.google.com with SMTP id h15so51341778ljh.12 for ; Wed, 05 Jan 2022 00:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vNflr5cs5BUcRZwMscYf7BnLjXanGzUBuspV/Xk2r04=; b=bYaGCbEBR8LaWyo8w3jp+SxJFadM1mDfZJGoWwoZc82SeWOl/cDZWFEDGvjfbC+N1N u/ldAvqnouVHBaGBqZTfYwBPgcNl6L0Y2n+7QMM3Y/E4W9ZzTnilF6hywiT1gIKeCfrv ddB1RHfW4aXpfvbmS/m7rBn07QkgUNEqewBtfb+AIw82/M6E/ZxvXGq3DLYZf2sPU6W5 DYSJ4pW5AbLTPo+PLtLUQe2GvANxS/abo3nleLYgev3YE/WIDdeBeGuxVSYpStLftgw+ b1dN8xSMLvRdaOcAOKmp4o1z384iON5QDjsriqzp4dVmcGSOKmnK6xsFIt2c68A5NVfz ZnbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vNflr5cs5BUcRZwMscYf7BnLjXanGzUBuspV/Xk2r04=; b=GO9RHS4PiDYoOv3FEdFAq/ua5m7jxyDwx3d2hsBiitXa5fXFhZDRzgykYkzAOHGT0T 83hPDey/FZWvnQLn39ZCCzX1j36TPNu0jQHTelmlPTXm84REE7chEkJh6kHHVcHWoTm1 +3KsatlQMzaiUpCqimAKs2H7OXXhjHeKEtJ3TpDMZDb8u8AIIGlC9bVZyy9+0qSBZLK3 Slkaegi68arVRZuwHUrHwNf9frK3iU13irwkP2v+xKF0h3rkx+NXO/3Rvtcf1tHOJDvB pWtr971t2xwfLEsDq6VJZBXftwoIeM9d81sBNZ+Ht0lcA3rH+T9VPjGGd3tOWLOfiSLQ LYVQ== X-Gm-Message-State: AOAM5319WriwrYo0jekkiqVlIGkk53iZN9MQp1m4BHKX2k5Xji/qDNeH tX0akcseqE6YQMx+LgFXALkNlES5rTulRWG0 X-Received: by 2002:a05:651c:ba8:: with SMTP id bg40mr38647409ljb.276.1641371469127; Wed, 05 Jan 2022 00:31:09 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id w25sm3631055lfl.229.2022.01.05.00.31.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 00:31:08 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 10:31:06 +0200 Message-Id: <20220105083107.1930899-3-martin@martin.st> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220105083107.1930899-1-martin@martin.st> References: <20220105083107.1930899-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] Revert "lavc/aarch64: add hevc sao edge 16x16" 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: JlRz9g2CCNSW This reverts commit a9214a2ca31c9d54f893c5ac4004a5ff30a08d10, as it breaks fate-hevc. --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 8 +-- libavcodec/aarch64/hevcdsp_sao_neon.S | 65 ----------------------- 2 files changed, 2 insertions(+), 71 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 747ff0412d..c785e46f79 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -57,8 +57,8 @@ void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, int16_t *sao_offset_val, int sao_left_class, int width, int height); -void ff_hevc_sao_edge_filter_16x16_8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride_dst, - int16_t *sao_offset_val, int eo, int width, int height); + + av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) { @@ -76,10 +76,6 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct_16x16_dc_8_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_8_neon; c->sao_band_filter[0] = ff_hevc_sao_band_filter_8x8_8_neon; - c->sao_edge_filter[1] = - c->sao_edge_filter[2] = - c->sao_edge_filter[3] = - c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_16x16_8_neon; } if (bit_depth == 10) { c->add_residual[0] = ff_hevc_add_residual_4x4_10_neon; diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index b8f0c65acc..d523bf584d 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -70,68 +70,3 @@ function ff_hevc_sao_band_filter_8x8_8_neon, export=1 bne 1b ret endfunc - -// ASSUMES STRIDE_SRC = 192 -.Lsao_edge_pos: -.word 1 // horizontal -.word 192 // vertical -.word 192 + 1 // 45 degree -.word 192 - 1 // 135 degree - -// ff_hevc_sao_edge_filter_16x16_8_neon(char *dst, char *src, ptrdiff stride_dst, -// int16 *sao_offset_val, int eo, int width, int height) -function ff_hevc_sao_edge_filter_16x16_8_neon, export=1 - adr x7, .Lsao_edge_pos - ld1 {v3.8h}, [x3] // load sao_offset_val - sxtw x5, w5 - ldr w4, [x7, w4, uxtw #2] // stride_src - mov v3.h[7], v3.h[0] // reorder to [1,2,0,3,4] - mov v3.h[0], v3.h[1] - mov v3.h[1], v3.h[2] - mov v3.h[2], v3.h[7] - // split 16bit values into two tables - uzp2 v1.16b, v3.16b, v3.16b // sao_offset_val -> upper - uzp1 v0.16b, v3.16b, v3.16b // sao_offset_val -> lower - movi v2.16b, #2 - mov x15, #192 - // strides between end of line and next src/dst - sub x15, x15, x5 // stride_src - width - sub x16, x2, x5 // stride_dst - width - mov x11, x1 // copy base src -1: // new line - mov x14, x5 // copy width - sub x12, x11, x4 // src_a (prev) = src - sao_edge_pos - add x13, x11, x4 // src_b (next) = src + sao_edge_pos -2: // process 16 bytes - ld1 {v3.16b}, [x11], #16 // load src - ld1 {v4.16b}, [x12], #16 // load src_a (prev) - ld1 {v5.16b}, [x13], #16 // load src_b (next) - cmhi v16.16b, v4.16b, v3.16b // (prev > cur) - cmhi v17.16b, v3.16b, v4.16b // (cur > prev) - cmhi v18.16b, v5.16b, v3.16b // (next > cur) - cmhi v19.16b, v3.16b, v5.16b // (cur > next) - sub v20.16b, v16.16b, v17.16b // diff0 = CMP(cur, prev) = (cur > prev) - (cur < prev) - sub v21.16b, v18.16b, v19.16b // diff1 = CMP(cur, next) = (cur > next) - (cur < next) - add v20.16b, v20.16b, v21.16b // diff = diff0 + diff1 - add v20.16b, v20.16b, v2.16b // offset_val = diff + 2 - tbl v16.16b, {v0.16b}, v20.16b - tbl v17.16b, {v1.16b}, v20.16b - uxtl v20.8h, v3.8b // src[0:7] - uxtl2 v21.8h, v3.16b // src[7:15] - zip1 v18.16b, v16.16b, v17.16b // sao_offset_val lower -> - zip2 v19.16b, v16.16b, v17.16b // sao_offset_val upper -> - sqadd v20.8h, v18.8h, v20.8h // + sao_offset_val - sqadd v21.8h, v19.8h, v21.8h - sqxtun v3.8b, v20.8h - sqxtun2 v3.16b, v21.8h - st1 {v3.16b}, [x0], #16 - subs x14, x14, #16 // filtered 16 bytes - b.ne 2b // do we have width to filter? - // no width to filter, setup next line - add x11, x11, x15 // stride src to next line - add x0, x0, x16 // stride dst to next line - subs w6, w6, #1 // filtered line - b.ne 1b // do we have lines to process? - // no lines to filter - ret -endfunc