Replace vp9_idct.h for precise dependency

This commit replaces vp9_idct.h with txfm_common.h in many SIMD
implementation files for precise file dependency.

Change-Id: If73dd726bb16537e7494f28538b0a169810f9756

diff --git a/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c b/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c
index 0233877dd380c06161f42b51a79a458f0add24af..9b14be1c1629a63d2dc67a7d09fd695417f4979b 100644 (file)
--- a/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c
@@ -10,8 +10,8 @@
 
 #include <arm_neon.h>
 
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
+#include "vpx_ports/mem.h"
 
 void vp9_idct16x16_1_add_neon(
         int16_t *input,

diff --git a/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c b/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c
index 0ce45f2bfa8186171f3bc89b874aca31d37ef041..702efa747c300ec46316c50a24777b1a641003ad 100644 (file)
--- a/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c
@@ -12,8 +12,8 @@
 
 #include "./vpx_config.h"
 
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
+#include "vpx_ports/mem.h"
 
 static INLINE void LD_16x8(
         uint8_t *d,

diff --git a/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c b/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c
index f0457358e6c6c26ff78f703685ae081a15089ab5..0ff22d5d550dc6c8b0b49cfc95eadfce62536bd8 100644 (file)
--- a/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c
@@ -10,8 +10,8 @@
 
 #include <arm_neon.h>
 
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
+#include "vpx_ports/mem.h"
 
 void vp9_idct4x4_1_add_neon(
         int16_t *input,

diff --git a/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c b/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c
index 5369697c7d1923929804cf1f3a8c03f57454305d..4178d349d5f365ba6bdab13c1e3a6add473cc946 100644 (file)
--- a/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c
@@ -10,8 +10,8 @@
 
 #include <arm_neon.h>
 
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
+#include "vpx_ports/mem.h"
 
 void vp9_idct8x8_1_add_neon(
         int16_t *input,

diff --git a/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
index 10a24f33ddb0a10a6b662e3d899124260581a729..cccddc78f08e29e4588161b7ca284529f6ef854c 100644 (file)
--- a/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
@@ -13,11 +13,11 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/txfm_common.h"
+#include "vpx_ports/mem.h"
 
 #if HAVE_DSPR2
 static void idct16_rows_dspr2(const int16_t *input, int16_t *output,

diff --git a/vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c
index a2561458181e215b1e8ee6e6ddde68b174433c6e..37b50c51586aab9833bd7644d28b85d605f905ee 100644 (file)
--- a/vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c
@@ -12,11 +12,11 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/txfm_common.h"
+#include "vpx_ports/mem.h"
 
 #if HAVE_DSPR2
 void vp9_idct32_cols_add_blk_dspr2(int16_t *input, uint8_t *dest,

diff --git a/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
index dd18831fce9eb5b54670dbcc197a84eac5f0ec7c..b4b0d248c696280c0b9a709fb1929e8c5ab8dffb 100644 (file)
--- a/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans32_dspr2.c
@@ -15,8 +15,8 @@
 #include "./vp9_rtcd.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/txfm_common.h"
 
 #if HAVE_DSPR2
 static void idct32_rows_dspr2(const int16_t *input, int16_t *output,

diff --git a/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
index 4e31f9feeae64b2dd3505d167a579c40670552ae..1a1afc5036938128180b20498bacf85fb3756334 100644 (file)
--- a/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
@@ -13,11 +13,11 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/txfm_common.h"
+#include "vpx_ports/mem.h"
 
 #if HAVE_DSPR2
 static void vp9_idct4_rows_dspr2(const int16_t *input, int16_t *output) {

diff --git a/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c b/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
index 6898d569c1808062f09528bb407badc5c8814351..672946e2350e94e400df571809bfc3b6ced5d76b 100644 (file)
--- a/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
@@ -13,11 +13,11 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
-#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
 #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/txfm_common.h"
+#include "vpx_ports/mem.h"
 
 #if HAVE_DSPR2
 static void idct8_rows_dspr2(const int16_t *input, int16_t *output,

diff --git a/vp9/encoder/arm/neon/vp9_dct_neon.c b/vp9/encoder/arm/neon/vp9_dct_neon.c
index 97106fff2577f10e5368438caee13cdc336bb2a7..941ad200005c54cdb44f60aad4ff5f96cf37fcaa 100644 (file)
--- a/vp9/encoder/arm/neon/vp9_dct_neon.c
+++ b/vp9/encoder/arm/neon/vp9_dct_neon.c
@@ -14,7 +14,7 @@
 #include "./vpx_config.h"
 
 #include "vp9/common/vp9_blockd.h"
-#include "vp9/common/vp9_idct.h"
+#include "vpx_dsp/txfm_common.h"
 
 void vp9_fdct8x8_1_neon(const int16_t *input, int16_t *output, int stride) {
   int r;

diff --git a/vp9/encoder/mips/msa/vp9_fdct_msa.h b/vp9/encoder/mips/msa/vp9_fdct_msa.h
index 6b8b1c80603784b130035f56ac180c5b3627a29c..425ba9db6429fb891fdfafae9237986274307282 100644 (file)
--- a/vp9/encoder/mips/msa/vp9_fdct_msa.h
+++ b/vp9/encoder/mips/msa/vp9_fdct_msa.h
@@ -11,7 +11,6 @@
 #ifndef VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_
 #define VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_
 
-#include "vp9/common/vp9_idct.h"
 #include "vpx_dsp/mips/fwd_txfm_msa.h"
 #include "vpx_dsp/mips/txfm_macros_msa.h"
 #include "vpx_ports/mem.h"

diff --git a/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h b/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h
index ae6bfe5fa2d793d00c5d02a7f7fcf3de0d16cd32..ba5e0597ae35a9ab9b7fa69b2673ded90bdb3e10 100644 (file)
--- a/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h
+++ b/vp9/encoder/x86/vp9_dct32x32_avx2_impl.h
@@ -11,7 +11,7 @@
 #include <immintrin.h>  // AVX2
 
 #include "./vp9_rtcd.h"
-#include "vp9/common/vp9_idct.h"  // for cospi constants
+#include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"
 
 #define pair256_set_epi16(a, b) \