Move headers to aom_dsp/arm/
This commit moves transpose_neon.h and mem_neon.h from av1/common/
to aom_dsp.
BUG=aomedia:2734
Change-Id: I22101ed4c3a219f8a5279e434dbffda3442bd800
diff --git a/aom_dsp/arm/avg_neon.c b/aom_dsp/arm/avg_neon.c
index c3d4de2..616e395 100644
--- a/aom_dsp/arm/avg_neon.c
+++ b/aom_dsp/arm/avg_neon.c
@@ -12,9 +12,9 @@
#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_dsp/arm/sum_neon.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
unsigned int aom_avg_4x4_neon(const uint8_t *a, int a_stride) {
const uint8x16_t b = load_unaligned_u8q(a, a_stride);
diff --git a/aom_dsp/arm/blend_a64_mask_neon.c b/aom_dsp/arm/blend_a64_mask_neon.c
index e7f08a5..8709e38 100644
--- a/aom_dsp/arm/blend_a64_mask_neon.c
+++ b/aom_dsp/arm/blend_a64_mask_neon.c
@@ -15,8 +15,8 @@
#include "aom/aom_integer.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/blend.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
#include "config/aom_dsp_rtcd.h"
static INLINE void blend8x1(int16x8_t mask, int16x8_t src_0, int16x8_t src_1,
diff --git a/aom_dsp/arm/fwd_txfm_neon.c b/aom_dsp/arm/fwd_txfm_neon.c
index ce93523..7fccdab 100644
--- a/aom_dsp/arm/fwd_txfm_neon.c
+++ b/aom_dsp/arm/fwd_txfm_neon.c
@@ -14,8 +14,8 @@
#include "config/aom_config.h"
#include "aom_dsp/txfm_common.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
static void aom_fdct4x4_helper(const int16_t *input, int stride,
int16x4_t *input_0, int16x4_t *input_1,
diff --git a/aom_dsp/arm/hadamard_neon.c b/aom_dsp/arm/hadamard_neon.c
index 929792a..7897155 100644
--- a/aom_dsp/arm/hadamard_neon.c
+++ b/aom_dsp/arm/hadamard_neon.c
@@ -12,8 +12,8 @@
#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
static void hadamard8x8_one_pass(int16x8_t *a0, int16x8_t *a1, int16x8_t *a2,
int16x8_t *a3, int16x8_t *a4, int16x8_t *a5,
diff --git a/aom_dsp/arm/loopfilter_neon.c b/aom_dsp/arm/loopfilter_neon.c
index aafac89..95d3a17 100644
--- a/aom_dsp/arm/loopfilter_neon.c
+++ b/aom_dsp/arm/loopfilter_neon.c
@@ -15,8 +15,8 @@
#include "config/aom_config.h"
#include "aom/aom_integer.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
static INLINE uint8x8_t lpf_mask(uint8x8_t p3q3, uint8x8_t p2q2, uint8x8_t p1q1,
uint8x8_t p0q0, const uint8_t blimit,
diff --git a/av1/common/arm/mem_neon.h b/aom_dsp/arm/mem_neon.h
similarity index 98%
rename from av1/common/arm/mem_neon.h
rename to aom_dsp/arm/mem_neon.h
index 171055f..ed18cde 100644
--- a/av1/common/arm/mem_neon.h
+++ b/aom_dsp/arm/mem_neon.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef AOM_AV1_COMMON_ARM_MEM_NEON_H_
-#define AOM_AV1_COMMON_ARM_MEM_NEON_H_
+#ifndef AOM_DSP_ARM_MEM_NEON_H_
+#define AOM_DSP_ARM_MEM_NEON_H_
#include <arm_neon.h>
#include <string.h>
@@ -536,4 +536,4 @@
vst1q_s32(buf + 4, v1);
}
-#endif // AOM_AV1_COMMON_ARM_MEM_NEON_H_
+#endif // AOM_DSP_ARM_MEM_NEON_H_
diff --git a/aom_dsp/arm/sse_neon.c b/aom_dsp/arm/sse_neon.c
index 1f73443..35b784a 100644
--- a/aom_dsp/arm/sse_neon.c
+++ b/aom_dsp/arm/sse_neon.c
@@ -12,9 +12,9 @@
#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_dsp/arm/sum_neon.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
static INLINE void sse_w16_neon(uint32x4_t *sum, const uint8_t *a,
const uint8_t *b) {
diff --git a/aom_dsp/arm/sum_squares_neon.c b/aom_dsp/arm/sum_squares_neon.c
index 1ce12ec..0b7337a 100644
--- a/aom_dsp/arm/sum_squares_neon.c
+++ b/aom_dsp/arm/sum_squares_neon.c
@@ -12,7 +12,7 @@
#include <arm_neon.h>
#include <assert.h>
-#include "av1/common/arm/mem_neon.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "config/aom_dsp_rtcd.h"
static INLINE uint32x4_t sum_squares_i16_4x4_neon(const int16_t *src,
diff --git a/av1/common/arm/transpose_neon.h b/aom_dsp/arm/transpose_neon.h
similarity index 99%
rename from av1/common/arm/transpose_neon.h
rename to aom_dsp/arm/transpose_neon.h
index 91d89b4..73d430a 100644
--- a/av1/common/arm/transpose_neon.h
+++ b/aom_dsp/arm/transpose_neon.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef AOM_AV1_COMMON_ARM_TRANSPOSE_NEON_H_
-#define AOM_AV1_COMMON_ARM_TRANSPOSE_NEON_H_
+#ifndef AOM_DSP_ARM_TRANSPOSE_NEON_H_
+#define AOM_DSP_ARM_TRANSPOSE_NEON_H_
#include <arm_neon.h>
@@ -599,4 +599,4 @@
*a3 = c1.val[1];
}
-#endif // AOM_AV1_COMMON_ARM_TRANSPOSE_NEON_H_
+#endif // AOM_DSP_ARM_TRANSPOSE_NEON_H_
diff --git a/av1/av1.cmake b/av1/av1.cmake
index de000e6..408a06e 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -489,8 +489,6 @@
"${AOM_ROOT}/av1/common/arm/convolve_neon.c"
"${AOM_ROOT}/av1/common/arm/convolve_neon.h"
"${AOM_ROOT}/av1/common/arm/jnt_convolve_neon.c"
- "${AOM_ROOT}/av1/common/arm/mem_neon.h"
- "${AOM_ROOT}/av1/common/arm/transpose_neon.h"
"${AOM_ROOT}/av1/common/arm/blend_a64_hmask_neon.c"
"${AOM_ROOT}/av1/common/arm/blend_a64_vmask_neon.c"
"${AOM_ROOT}/av1/common/arm/reconinter_neon.c"
diff --git a/av1/common/arm/av1_inv_txfm_neon.c b/av1/common/arm/av1_inv_txfm_neon.c
index 2f3567a..4bc9fa2 100644
--- a/av1/common/arm/av1_inv_txfm_neon.c
+++ b/av1/common/arm/av1_inv_txfm_neon.c
@@ -15,13 +15,13 @@
#include "config/aom_dsp_rtcd.h"
#include "config/av1_rtcd.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "av1/common/av1_inv_txfm1d.h"
#include "av1/common/av1_inv_txfm1d_cfg.h"
#include "av1/common/av1_txfm.h"
#include "av1/common/enums.h"
#include "av1/common/idct.h"
#include "av1/common/arm/av1_inv_txfm_neon.h"
-#include "av1/common/arm/transpose_neon.h"
// 1D itx types
typedef enum ATTRIBUTE_PACKED {
diff --git a/av1/common/arm/av1_txfm_neon.c b/av1/common/arm/av1_txfm_neon.c
index 7e3a05a..f955a37 100644
--- a/av1/common/arm/av1_txfm_neon.c
+++ b/av1/common/arm/av1_txfm_neon.c
@@ -14,8 +14,8 @@
#include "config/av1_rtcd.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
void av1_round_shift_array_neon(int32_t *arr, int size, int bit) {
assert(!(size % 4));
diff --git a/av1/common/arm/blend_a64_hmask_neon.c b/av1/common/arm/blend_a64_hmask_neon.c
index 7134f18..4639d4c 100644
--- a/av1/common/arm/blend_a64_hmask_neon.c
+++ b/av1/common/arm/blend_a64_hmask_neon.c
@@ -14,10 +14,10 @@
#include <assert.h>
#include "aom/aom_integer.h"
-#include "aom_dsp/blend.h"
-#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
#include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/blend.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_ports/mem.h"
#include "config/aom_dsp_rtcd.h"
void aom_blend_a64_hmask_neon(uint8_t *dst, uint32_t dst_stride,
diff --git a/av1/common/arm/blend_a64_vmask_neon.c b/av1/common/arm/blend_a64_vmask_neon.c
index 194e94c..061af74 100644
--- a/av1/common/arm/blend_a64_vmask_neon.c
+++ b/av1/common/arm/blend_a64_vmask_neon.c
@@ -14,10 +14,10 @@
#include <assert.h>
#include "aom/aom_integer.h"
-#include "aom_dsp/blend.h"
-#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
#include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/blend.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_ports/mem.h"
#include "config/aom_dsp_rtcd.h"
void aom_blend_a64_vmask_neon(uint8_t *dst, uint32_t dst_stride,
diff --git a/av1/common/arm/convolve_neon.c b/av1/common/arm/convolve_neon.c
index 278d72e..f0e4bed 100644
--- a/av1/common/arm/convolve_neon.c
+++ b/av1/common/arm/convolve_neon.c
@@ -16,12 +16,12 @@
#include "config/av1_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "aom_ports/mem.h"
#include "av1/common/convolve.h"
#include "av1/common/filter.h"
#include "av1/common/arm/convolve_neon.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
static INLINE int16x4_t convolve8_4x4(const int16x4_t s0, const int16x4_t s1,
const int16x4_t s2, const int16x4_t s3,
diff --git a/av1/common/arm/jnt_convolve_neon.c b/av1/common/arm/jnt_convolve_neon.c
index 85a5eaa..e0b76a8 100644
--- a/av1/common/arm/jnt_convolve_neon.c
+++ b/av1/common/arm/jnt_convolve_neon.c
@@ -16,11 +16,11 @@
#include "config/av1_rtcd.h"
#include "aom_dsp/txfm_common.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "aom_ports/mem.h"
#include "av1/common/common.h"
#include "av1/common/arm/convolve_neon.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
#if !defined(__aarch64__)
static INLINE void compute_avg_4x1(
diff --git a/av1/common/arm/reconinter_neon.c b/av1/common/arm/reconinter_neon.c
index 44e0641..3694763 100644
--- a/av1/common/arm/reconinter_neon.c
+++ b/av1/common/arm/reconinter_neon.c
@@ -15,8 +15,8 @@
#include "aom/aom_integer.h"
#include "aom_dsp/blend.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
#include "av1/common/blockd.h"
#include "config/av1_rtcd.h"
diff --git a/av1/common/arm/resize_neon.c b/av1/common/arm/resize_neon.c
index e42766e..190a3b2 100644
--- a/av1/common/arm/resize_neon.c
+++ b/av1/common/arm/resize_neon.c
@@ -12,10 +12,10 @@
#include <arm_neon.h>
#include <assert.h>
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "av1/common/resize.h"
-#include "av1/common/arm/mem_neon.h"
#include "av1/common/arm/convolve_neon.h"
-#include "av1/common/arm/transpose_neon.h"
#include "config/av1_rtcd.h"
#include "config/aom_scale_rtcd.h"
diff --git a/av1/common/arm/selfguided_neon.c b/av1/common/arm/selfguided_neon.c
index fc404a6..f5eb36c 100644
--- a/av1/common/arm/selfguided_neon.c
+++ b/av1/common/arm/selfguided_neon.c
@@ -17,14 +17,14 @@
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/txfm_common.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
#include "av1/common/av1_common_int.h"
#include "av1/common/common.h"
#include "av1/common/resize.h"
#include "av1/common/restoration.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
// Constants used for right shift in final_filter calculation.
#define NB_EVEN 5
diff --git a/av1/common/arm/wiener_convolve_neon.c b/av1/common/arm/wiener_convolve_neon.c
index a9bb5bc..06e7555 100644
--- a/av1/common/arm/wiener_convolve_neon.c
+++ b/av1/common/arm/wiener_convolve_neon.c
@@ -16,11 +16,11 @@
#include "config/av1_rtcd.h"
#include "aom_dsp/txfm_common.h"
+#include "aom_dsp/arm/mem_neon.h"
+#include "aom_dsp/arm/transpose_neon.h"
#include "aom_ports/mem.h"
#include "av1/common/common.h"
#include "av1/common/arm/convolve_neon.h"
-#include "av1/common/arm/mem_neon.h"
-#include "av1/common/arm/transpose_neon.h"
/* Wiener filter 2D
Apply horizontal filter and store in a temporary buffer. When applying
diff --git a/av1/encoder/arm/neon/av1_error_neon.c b/av1/encoder/arm/neon/av1_error_neon.c
index 22da1a8..124c1fd 100644
--- a/av1/encoder/arm/neon/av1_error_neon.c
+++ b/av1/encoder/arm/neon/av1_error_neon.c
@@ -11,8 +11,8 @@
#include <arm_neon.h>
#include <assert.h>
-#include "av1/common/arm/mem_neon.h"
#include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/arm/mem_neon.h"
int64_t av1_block_error_neon(const tran_low_t *coeff, const tran_low_t *dqcoeff,
intptr_t block_size, int64_t *ssz) {
diff --git a/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c b/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
index b9a314d..a90cfa8 100644
--- a/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
+++ b/av1/encoder/arm/neon/av1_fwd_txfm2d_neon.c
@@ -13,10 +13,10 @@
#include <assert.h>
#include "aom_dsp/txfm_common.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_ports/mem.h"
#include "av1/common/av1_txfm.h"
#include "av1/encoder/av1_fwd_txfm1d_cfg.h"
-#include "av1/common/arm/mem_neon.h"
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
diff --git a/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c b/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c
index f5d1f16..ad81f40 100644
--- a/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c
+++ b/av1/encoder/arm/neon/av1_temporal_denoiser_neon.c
@@ -13,8 +13,8 @@
#include <assert.h>
#include "aom/aom_integer.h"
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_ports/mem.h"
-#include "av1/common/arm/mem_neon.h"
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
diff --git a/av1/encoder/arm/neon/encodetxb_neon.c b/av1/encoder/arm/neon/encodetxb_neon.c
index 4ededd8..9bb822a 100644
--- a/av1/encoder/arm/neon/encodetxb_neon.c
+++ b/av1/encoder/arm/neon/encodetxb_neon.c
@@ -13,9 +13,9 @@
#include <assert.h>
#include <math.h>
+#include "aom_dsp/arm/mem_neon.h"
#include "av1/common/txb_common.h"
#include "av1/encoder/encodetxb.h"
-#include "av1/common/arm/mem_neon.h"
void av1_txb_init_levels_neon(const tran_low_t *const coeff, const int width,
const int height, uint8_t *const levels) {
diff --git a/av1/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/neon/quantize_neon.c
index 4eadbbc..b0e8950 100644
--- a/av1/encoder/arm/neon/quantize_neon.c
+++ b/av1/encoder/arm/neon/quantize_neon.c
@@ -13,11 +13,11 @@
#include <math.h>
+#include "aom_dsp/arm/mem_neon.h"
#include "aom_mem/aom_mem.h"
#include "av1/common/quant_common.h"
#include "av1/common/seg_common.h"
-#include "av1/common/arm/mem_neon.h"
#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encoder.h"
