From: "Martin Storsjö" <martin@martin.st>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 2/4] Revert "lavc/aarch64: add hevc sao edge 8x8"
Date: Wed, 5 Jan 2022 10:31:05 +0200
Message-ID: <20220105083107.1930899-2-martin@martin.st> (raw)
In-Reply-To: <20220105083107.1930899-1-martin@martin.st>
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
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-01-05 8:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 8:31 [FFmpeg-devel] [PATCH 1/4] Revert "lavc/aarch64: add hevc sao band 8x8 tiling" Martin Storsjö
2022-01-05 8:31 ` Martin Storsjö [this message]
2022-01-05 8:31 ` [FFmpeg-devel] [PATCH 3/4] Revert "lavc/aarch64: add hevc sao edge 16x16" Martin Storsjö
2022-01-05 8:31 ` [FFmpeg-devel] [PATCH 4/4] aarch64: Disable ff_hevc_sao_band_filter_8x8_8_neon out of precaution Martin Storsjö
2022-01-05 12:08 ` James Almer
2022-01-05 12:15 ` Martin Storsjö
2022-01-06 23:30 ` Martin Storsjö
2022-01-07 21:01 ` Martin Storsjö
2022-01-09 17:15 ` Andriy Gelman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220105083107.1930899-2-martin@martin.st \
--to=martin@martin.st \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git