From patchwork Wed Jan 5 08:31:05 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: 33082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp520183iog; Wed, 5 Jan 2022 00:31:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4M9kmx0Jnhj6vZ/BAt0LgRrbaz/0KzAbArhx1oKqfjop3qYh6RuTJM4+UaGFbEw5g8NFH X-Received: by 2002:a17:906:7305:: with SMTP id di5mr41960023ejc.255.1641371497346; Wed, 05 Jan 2022 00:31:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641371497; cv=none; d=google.com; s=arc-20160816; b=d6l/ykMz/vjAvmoE1A5SnRxrfHsjxF09d2+qP5VhWFdcYmFzqQ181Oi4RbtTwI0/ip l7hh4hm6zjHbSsUUJtkCzeIYffI5DJ+9YsvQi9Yceh+0KX+EDWVHeFxCyZjl3Xj4atIr hJdUvF0AQJOXddPi/NA3oLhSu5N0Kxk/DE894ThKHUEwIwTYpKzFY5ptnSDo6mSoP/hy M3NttW7RWd1epjVyIPCXguOoSnaJu60FTSrQIhWmuc9vDZHLgycBuN6tD9OAxQbVS+qw Lns48jlrABn6xVhIBLGJmQu/3p8Ly5wOojs8cHi7+kuyi+JQbAVhktlACSp7R3lANeI3 uXnQ== 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=1lLv0rRv6bvKsxGYnWHuG8uXQ+1Qo1lRv6Jh+Ua6nWE=; b=oliBn/UDGoMYQmrSZnbm7gRPNH2eiS9p4CpgNh2cLVK4Y+0/hXOoW+X58iyA5vxPyi STBF5b3GoCC/o5ujUOomo5/WmfsCkCs3hiwozUKPg/HKeWZ+oXc94ASCJEK2PsEiTPnD ExfyRnQX8gGKVgbK3yUmala7TqNEf86ipHAm4YLDk/Gle1jrZzuMEzJNRyqPFz9RX6ZJ OgM+BLFgzPT7WaYpy3rj5RSVopEVMn0KMebrrqxOLIr6uYMpEYJqIxcJtbDE1y5wci0H Y7pd7Tq9GIENHREQ7+QagynDYknn4X1W5MMLwCznbFam8FmhDluqVwUXyxDBYu8r06t9 pY6g== 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=ZbA8eDb3; 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 o1si19760181edt.598.2022.01.05.00.31.37; Wed, 05 Jan 2022 00:31: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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=ZbA8eDb3; 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 77F1568AAE6; Wed, 5 Jan 2022 10:31:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0431368A948 for ; Wed, 5 Jan 2022 10:31:09 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id k21so87518086lfu.0 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=5L9C/BHZyoVkKy4srjWRsV1XSO65CXje6+iDRgJMXAQ=; b=ZbA8eDb3FNncb8dZR+zTJyfYn/4pLy3gQZ5UX3ie+gdF/qtYXngRCei8qt/H6doR8B df5d2+TU/ZZB/Kyy7syl1MAElP88ZZq7cu1nTI3h39DZ9+WtUib8PpkcHHr3eJqgbz85 DU1Dh3XCLMKdb4DYhKhT8uJeSTH7mHX2SNWfqk1/fnNcO8AcwwCBRi+uSyXkuSqZHerY fP/ERdmjDEQ6fVlxWwG7suCuOHNDDJZOxahOQ8uqf7gXyBcuNbuYBIqwL/Vl5hzZDDmx rf/d5bny5JCKbp207YKHx7WR7/Jeo24CPjFG2k20UvA3UKthknk1hqcpfKrU5DQkLL7G rJAQ== 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=5L9C/BHZyoVkKy4srjWRsV1XSO65CXje6+iDRgJMXAQ=; b=Vk9mig/Cw3HcRO8MYrfhmZ7T47HSzOV3oXLLBvYjvpT5+lNriM+XxWz8M4YM9ODtxr 614kpJwWSmNxFzh7VBM9cve/Wa+ktV3G4/jp0veMguCFcC8DBsPqzW1TXQZxx8CZ8xoL IHmxUvDNePN8G3EScsSchGyLestLEK38ntaunYl7XF1fQPSlIiKMYxzhBo0ztp/Mnayd mXSC1S7TH4RpCQYrkECApPLtDXpu9/e/bMAoGE8UHTMhxZ+Yc6xWYT4tr7EKA9JKPl9e qIaH9WmDA2HAmT/fDU60wG8NYR2WBPjvxN2vxwnnqCpnlGzZkWemcqA+BObEyeHX8kxI cQsg== X-Gm-Message-State: AOAM532vJ6HkPwtN4d0tjJpyCq05aOqmpXTjrgzqRKndwmH8noPhel+7 D0M/FWvomOfIfDBxcOpWN2Y8GaATk508upIy X-Received: by 2002:a19:488b:: with SMTP id v133mr22051328lfa.139.1641371468691; Wed, 05 Jan 2022 00:31:08 -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:05 +0200 Message-Id: <20220105083107.1930899-2-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 2/4] Revert "lavc/aarch64: add hevc sao edge 8x8" 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: lr7rNNyh0wh0 This reverts commit c97ffc1a77ccaf901e642bd21ed26aaf75557745, as it breaks fate-hevc. --- libavcodec/aarch64/hevcdsp_init_aarch64.c | 3 -- libavcodec/aarch64/hevcdsp_sao_neon.S | 51 ----------------------- 2 files changed, 54 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index b93cec9e44..747ff0412d 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -59,8 +59,6 @@ void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, uint8_t *_src, 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); -void ff_hevc_sao_edge_filter_8x8_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) { @@ -78,7 +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[0] = ff_hevc_sao_edge_filter_8x8_8_neon; c->sao_edge_filter[1] = c->sao_edge_filter[2] = c->sao_edge_filter[3] = diff --git a/libavcodec/aarch64/hevcdsp_sao_neon.S b/libavcodec/aarch64/hevcdsp_sao_neon.S index 73b0b3b056..b8f0c65acc 100644 --- a/libavcodec/aarch64/hevcdsp_sao_neon.S +++ b/libavcodec/aarch64/hevcdsp_sao_neon.S @@ -135,54 +135,3 @@ function ff_hevc_sao_edge_filter_16x16_8_neon, export=1 // no lines to filter ret endfunc - -// ff_hevc_sao_edge_filter_8x8_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_8x8_8_neon, export=1 - adr x7, .Lsao_edge_pos - ldr w4, [x7, w4, uxtw #2] - ld1 {v3.8h}, [x3] - mov v3.h[7], v3.h[0] - mov v3.h[0], v3.h[1] - mov v3.h[1], v3.h[2] - mov v3.h[2], v3.h[7] - uzp2 v1.16b, v3.16b, v3.16b - uzp1 v0.16b, v3.16b, v3.16b - movi v2.16b, #2 - add x16, x0, x2 - lsl x2, x2, #1 - mov x15, #192 - mov x8, x1 - sub x9, x1, x4 - add x10, x1, x4 - mov x17, #4 -1: ld1 {v3.d}[0], [ x8], x15 - ld1 {v4.d}[0], [ x9], x15 - ld1 {v5.d}[0], [x10], x15 - ld1 {v3.d}[1], [ x8], x15 - ld1 {v4.d}[1], [ x9], x15 - ld1 {v5.d}[1], [x10], x15 - cmhi v16.16b, v4.16b, v3.16b - cmhi v17.16b, v3.16b, v4.16b - cmhi v18.16b, v5.16b, v3.16b - cmhi v19.16b, v3.16b, v5.16b - sub v20.16b, v16.16b, v17.16b - sub v21.16b, v18.16b, v19.16b - add v20.16b, v20.16b, v21.16b - add v20.16b, v20.16b, v2.16b - tbl v16.16b, {v0.16b}, v20.16b - tbl v17.16b, {v1.16b}, v20.16b - uxtl v20.8h, v3.8b - uxtl2 v21.8h, v3.16b - zip1 v18.16b, v16.16b, v17.16b - zip2 v19.16b, v16.16b, v17.16b - sqadd v20.8h, v18.8h, v20.8h - sqadd v21.8h, v19.8h, v21.8h - sqxtun v6.8b, v20.8h - sqxtun v7.8b, v21.8h - st1 {v6.8b}, [ x0], x2 - st1 {v7.8b}, [x16], x2 - subs x17, x17, #1 - b.ne 1b - ret -endfunc