Move mem_sse2.h from av1/common/x86 to aom_dsp/x86
Change-Id: Ia07e909c89eda3742682531dca068ecf63a6281e
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 8fcfbcb..2844d6f 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -47,9 +47,10 @@
"${AOM_ROOT}/aom_dsp/x86/aom_asm_stubs.c"
"${AOM_ROOT}/aom_dsp/x86/convolve.h"
"${AOM_ROOT}/aom_dsp/x86/intrapred_sse2.c"
- "${AOM_ROOT}/aom_dsp/x86/txfm_common_sse2.h"
+ "${AOM_ROOT}/aom_dsp/x86/loopfilter_sse2.c"
"${AOM_ROOT}/aom_dsp/x86/lpf_common_sse2.h"
- "${AOM_ROOT}/aom_dsp/x86/loopfilter_sse2.c")
+ "${AOM_ROOT}/aom_dsp/x86/mem_sse2.h"
+ "${AOM_ROOT}/aom_dsp/x86/txfm_common_sse2.h")
set(AOM_DSP_COMMON_ASM_SSSE3
"${AOM_ROOT}/aom_dsp/x86/aom_subpixel_8t_ssse3.asm"
diff --git a/aom_dsp/aom_dsp.mk b/aom_dsp/aom_dsp.mk
index 594fab4..1c40905 100644
--- a/aom_dsp/aom_dsp.mk
+++ b/aom_dsp/aom_dsp.mk
@@ -215,6 +215,7 @@
DSP_SRCS-yes += txfm_common.h
DSP_SRCS-yes += x86/txfm_common_intrin.h
DSP_SRCS-$(HAVE_AVX2) += x86/common_avx2.h
+DSP_SRCS-$(HAVE_SSE2) += x86/mem_sse2.h
DSP_SRCS-$(HAVE_SSE2) += x86/txfm_common_sse2.h
DSP_SRCS-$(HAVE_SSSE3) += x86/obmc_intrinsic_ssse3.h
DSP_SRCS-$(HAVE_MSA) += mips/txfm_macros_msa.h
diff --git a/av1/common/x86/mem_sse2.h b/aom_dsp/x86/mem_sse2.h
similarity index 87%
rename from av1/common/x86/mem_sse2.h
rename to aom_dsp/x86/mem_sse2.h
index 432fd99..54f16dd 100644
--- a/av1/common/x86/mem_sse2.h
+++ b/aom_dsp/x86/mem_sse2.h
@@ -9,8 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#ifndef AV1_COMMON_X86_MEM_SSE2_H_
-#define AV1_COMMON_X86_MEM_SSE2_H_
+#ifndef AOM_DSP_X86_MEM_SSE2_H_
+#define AOM_DSP_X86_MEM_SSE2_H_
#include <emmintrin.h> // SSE2
@@ -22,4 +22,4 @@
_mm_loadh_pi(_mm_castsi128_ps(s), (const __m64 *)src));
}
-#endif // AV1_COMMON_X86_MEM_SSE2_H_
+#endif // AOM_DSP_X86_MEM_SSE2_H_
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 804941a..82c308f 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -254,8 +254,7 @@
set(AOM_AV1_COMMON_INTRIN_SSE2
${AOM_AV1_COMMON_INTRIN_SSE2}
- "${AOM_ROOT}/av1/common/cdef_block_sse2.c"
- "${AOM_ROOT}/av1/common/x86/mem_sse2.h")
+ "${AOM_ROOT}/av1/common/cdef_block_sse2.c")
set(AOM_AV1_COMMON_INTRIN_SSSE3
${AOM_AV1_COMMON_INTRIN_SSSE3}
diff --git a/av1/av1_common.mk b/av1/av1_common.mk
index ed5a7ec..86351ee 100644
--- a/av1/av1_common.mk
+++ b/av1/av1_common.mk
@@ -76,7 +76,6 @@
AV1_COMMON_SRCS-yes += common/av1_inv_txfm2d.c
AV1_COMMON_SRCS-yes += common/av1_inv_txfm1d_cfg.h
AV1_COMMON_SRCS-$(HAVE_AVX2) += common/x86/convolve_avx2.c
-AV1_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mem_sse2.h
AV1_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/av1_convolve_ssse3.c
ifeq ($(CONFIG_CONVOLVE_ROUND)x$(CONFIG_COMPOUND_ROUND),yesx)
AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_convolve_scale_sse4.c
diff --git a/av1/common/x86/txb_sse2.c b/av1/common/x86/txb_sse2.c
index 9f82dbd..775d083 100644
--- a/av1/common/x86/txb_sse2.c
+++ b/av1/common/x86/txb_sse2.c
@@ -13,9 +13,9 @@
#include <emmintrin.h> // SSE2
#include "aom/aom_integer.h"
+#include "aom_dsp/x86/mem_sse2.h"
#include "av1/common/onyxc_int.h"
#include "av1/common/txb_common.h"
-#include "av1/common/x86/mem_sse2.h"
static INLINE __m128i load_8bit_4x4_sse2(const void *const s0,
const void *const s1,
