History

aarch64/hevc: Move sao to h26x directory

So vvc can reuse the implementation.

Zhao Zhili committed 2 years ago

Commit 8cc10291 parent 93281634 files · +39 −10Browse files

Unified · Split

4 files
  1. libavcodec/aarch64/Makefile +1 −1
  2. libavcodec/aarch64/h26x/dsp.h +36 −0
  3. libavcodec/aarch64/h26x/sao_neon.S +1 −1
  4. libavcodec/aarch64/hevcdsp_init_aarch64.c +1 −8
libavcodec/aarch64/Makefile+1−1
@@ -73,4 +73,4 @@ NEON-OBJS-$(CONFIG_HEVC_DECODER) += aarch64/hevcdsp_deblock_neon.o \ · 72 unmodified lines
7373 aarch64/hevcdsp_init_aarch64.o \
7474 aarch64/hevcdsp_qpel_neon.o \
7575 aarch64/hevcdsp_epel_neon.o \
76− aarch64/hevcdsp_sao_neon.o
76+ aarch64/h26x/sao_neon.o
libavcodec/aarch64/h26x/dsp.h+36−0
@@ -0,0 +1,36 @@
1+/*
2+ * Copyright (C) 2024 Zhao Zhili
3+ *
4+ * This file is part of FFmpeg.
5+ *
6+ * FFmpeg is free software; you can redistribute it and/or
7+ * modify it under the terms of the GNU Lesser General Public
8+ * License as published by the Free Software Foundation; either
9+ * version 2.1 of the License, or (at your option) any later version.
10+ *
11+ * FFmpeg is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14+ * Lesser General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU Lesser General Public
17+ * License along with FFmpeg; if not, write to the Free Software
18+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19+ */
20+
21+#ifndef AVCODEC_AARCH64_H26X_DSP_H
22+#define AVCODEC_AARCH64_H26X_DSP_H
23+
24+#include <stddef.h>
25+#include <stdint.h>
26+
27+void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, const uint8_t *_src,
28+ ptrdiff_t stride_dst, ptrdiff_t stride_src,
29+ const int16_t *sao_offset_val, int sao_left_class,
30+ int width, int height);
31+void ff_hevc_sao_edge_filter_16x16_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst,
32+ const int16_t *sao_offset_val, int eo, int width, int height);
33+void ff_hevc_sao_edge_filter_8x8_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst,
34+ const int16_t *sao_offset_val, int eo, int width, int height);
35+
36+#endif
libavcodec/aarch64/h26x/sao_neon.Srenamed from libavcodec/aarch64/hevcdsp_sao_neon.S+1−1
@@ -1,7 +1,7 @@
11 /* -*-arm64-*-
22 * vim: syntax=arm64asm
33 *
4− * AArch64 NEON optimised SAO functions for HEVC decoding
4+ * AArch64 NEON optimised SAO functions for h26x decoding
55 *
66 * Copyright (c) 2022 J. Dekker <jdek@itanimul.li>
77 *
libavcodec/aarch64/hevcdsp_init_aarch64.c+1−8
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/attributes.h"
2525 #include "libavutil/cpu.h"
2626 #include "libavutil/aarch64/cpu.h"
27+#include "libavcodec/aarch64/h26x/dsp.h"
2728 #include "libavcodec/hevc/dsp.h"
2829
2930 void ff_hevc_v_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride,
@@ -91,14 +92,6 @@ void ff_hevc_idct_8x8_dc_10_neon(int16_t *coeffs); · 61 unmodified lines
9192 void ff_hevc_idct_16x16_dc_10_neon(int16_t *coeffs);
9293 void ff_hevc_idct_32x32_dc_10_neon(int16_t *coeffs);
9394 void ff_hevc_transform_luma_4x4_neon_8(int16_t *coeffs);
94−void ff_hevc_sao_band_filter_8x8_8_neon(uint8_t *_dst, const uint8_t *_src,
95− ptrdiff_t stride_dst, ptrdiff_t stride_src,
96− const int16_t *sao_offset_val, int sao_left_class,
97− int width, int height);
98−void ff_hevc_sao_edge_filter_16x16_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst,
99− const int16_t *sao_offset_val, int eo, int width, int height);
100−void ff_hevc_sao_edge_filter_8x8_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst,
101− const int16_t *sao_offset_val, int eo, int width, int height);
10295 void ff_hevc_put_hevc_qpel_h4_8_neon(int16_t *dst, const uint8_t *_src, ptrdiff_t _srcstride, int height,
10396 intptr_t mx, intptr_t my, int width);
10497 void ff_hevc_put_hevc_qpel_h6_8_neon(int16_t *dst, const uint8_t *_src, ptrdiff_t _srcstride, int height,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t