Move odintrin.{c,h} to aom_dsp/
BUG=aomedia:2734
Change-Id: Id785b1c9472f9a40ca070fbcfea31cbb4f2e50b6
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 1303072..15a7615 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -34,6 +34,8 @@
"${AOM_ROOT}/aom_dsp/intrapred.c"
"${AOM_ROOT}/aom_dsp/intrapred_common.h"
"${AOM_ROOT}/aom_dsp/loopfilter.c"
+ "${AOM_ROOT}/aom_dsp/odintrin.c"
+ "${AOM_ROOT}/aom_dsp/odintrin.h"
"${AOM_ROOT}/aom_dsp/prob.h"
"${AOM_ROOT}/aom_dsp/recenter.h"
"${AOM_ROOT}/aom_dsp/simd/v128_intrinsics.h"
diff --git a/aom_dsp/bitreader.h b/aom_dsp/bitreader.h
index 255d98c..29321f9 100644
--- a/aom_dsp/bitreader.h
+++ b/aom_dsp/bitreader.h
@@ -20,8 +20,8 @@
#include "aom/aomdx.h"
#include "aom/aom_integer.h"
#include "aom_dsp/entdec.h"
+#include "aom_dsp/odintrin.h"
#include "aom_dsp/prob.h"
-#include "av1/common/odintrin.h"
#if CONFIG_BITSTREAM_DEBUG
#include "aom_util/debug_util.h"
diff --git a/aom_dsp/entcode.h b/aom_dsp/entcode.h
index 7518879..526ca59 100644
--- a/aom_dsp/entcode.h
+++ b/aom_dsp/entcode.h
@@ -14,7 +14,7 @@
#include <limits.h>
#include <stddef.h>
-#include "av1/common/odintrin.h"
+#include "aom_dsp/odintrin.h"
#include "aom_dsp/prob.h"
#define EC_PROB_SHIFT 6
diff --git a/av1/common/odintrin.c b/aom_dsp/odintrin.c
similarity index 99%
rename from av1/common/odintrin.c
rename to aom_dsp/odintrin.c
index 7584b2e..eb6d8d8 100644
--- a/av1/common/odintrin.c
+++ b/aom_dsp/odintrin.c
@@ -11,7 +11,7 @@
/* clang-format off */
-#include "av1/common/odintrin.h"
+#include "aom_dsp/odintrin.h"
/*Constants for use with OD_DIVU_SMALL().
See \cite{Rob05} for details on computing these constants.
diff --git a/av1/common/odintrin.h b/aom_dsp/odintrin.h
similarity index 98%
rename from av1/common/odintrin.h
rename to aom_dsp/odintrin.h
index e1db0f4..fa7b6ae 100644
--- a/av1/common/odintrin.h
+++ b/aom_dsp/odintrin.h
@@ -20,7 +20,6 @@
#include "aom/aom_integer.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/bitops.h"
-#include "av1/common/enums.h"
#ifdef __cplusplus
extern "C" {
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 408a06e..d16ec3c 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -60,8 +60,6 @@
"${AOM_ROOT}/av1/common/mvref_common.h"
"${AOM_ROOT}/av1/common/obu_util.c"
"${AOM_ROOT}/av1/common/obu_util.h"
- "${AOM_ROOT}/av1/common/odintrin.c"
- "${AOM_ROOT}/av1/common/odintrin.h"
"${AOM_ROOT}/av1/common/pred_common.c"
"${AOM_ROOT}/av1/common/pred_common.h"
"${AOM_ROOT}/av1/common/quant_common.c"
diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h
index f243734..980f31c 100644
--- a/av1/common/av1_common_int.h
+++ b/av1/common/av1_common_int.h
@@ -29,9 +29,9 @@
#include "av1/common/restoration.h"
#include "av1/common/tile_common.h"
#include "av1/common/timing.h"
-#include "av1/common/odintrin.h"
#include "aom_dsp/grain_synthesis.h"
#include "aom_dsp/grain_table.h"
+#include "aom_dsp/odintrin.h"
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index eedea61..af61fcd 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -15,6 +15,7 @@
*/
#include "aom/aom_integer.h"
+#include "aom_dsp/odintrin.h"
#include "aom_dsp/txfm_common.h"
#include "av1/common/common.h"
#include "av1/common/enums.h"
@@ -22,7 +23,6 @@
#include "av1/common/filter.h"
#include "av1/common/convolve.h"
#include "av1/common/av1_txfm.h"
-#include "av1/common/odintrin.h"
#include "av1/common/restoration.h"
struct macroblockd;
diff --git a/av1/common/cdef_block.h b/av1/common/cdef_block.h
index 574df2d..27c57dd 100644
--- a/av1/common/cdef_block.h
+++ b/av1/common/cdef_block.h
@@ -12,7 +12,7 @@
#ifndef AOM_AV1_COMMON_CDEF_BLOCK_H_
#define AOM_AV1_COMMON_CDEF_BLOCK_H_
-#include "av1/common/odintrin.h"
+#include "aom_dsp/odintrin.h"
#define CDEF_BLOCKSIZE 64
#define CDEF_BLOCKSIZE_LOG2 6
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index b093e78..c77d454 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -14,9 +14,14 @@
#include "config/aom_config.h"
+#include "aom_dsp/aom_dsp_common.h"
+#include "aom_dsp/odintrin.h"
+#include "aom_mem/aom_mem.h"
+#include "aom_ports/aom_timer.h"
+#include "aom_ports/mem.h"
+#include "aom_scale/aom_scale.h"
#include "av1/common/alloccommon.h"
#include "av1/common/av1_common_int.h"
-#include "av1/common/odintrin.h"
#include "av1/common/quant_common.h"
#include "av1/common/reconinter.h"
#include "av1/encoder/av1_quantize.h"
@@ -30,11 +35,6 @@
#include "av1/encoder/reconinter_enc.h"
#include "av1/encoder/segmentation.h"
#include "av1/encoder/temporal_filter.h"
-#include "aom_dsp/aom_dsp_common.h"
-#include "aom_mem/aom_mem.h"
-#include "aom_ports/aom_timer.h"
-#include "aom_ports/mem.h"
-#include "aom_scale/aom_scale.h"
/*!\cond */
diff --git a/test/divu_small_test.cc b/test/divu_small_test.cc
index f4d0846..496fbc1 100644
--- a/test/divu_small_test.cc
+++ b/test/divu_small_test.cc
@@ -14,7 +14,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
-#include "av1/common/odintrin.h"
+#include "aom_dsp/odintrin.h"
using libaom_test::ACMRandom;
