diff options
-rw-r--r-- | vp9/common/vp9_blockd.h | 1 | ||||
-rw-r--r-- | vp9/common/vp9_idct.c | 3 | ||||
-rw-r--r-- | vp9/common/vp9_idct.h | 11 | ||||
-rw-r--r-- | vp9/common/vp9_rtcd_defs.pl | 1 | ||||
-rw-r--r-- | vpx/vpx_integer.h | 11 |
5 files changed, 11 insertions, 16 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 702efe07b..03ab2257e 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -21,7 +21,6 @@ #include "vp9/common/vp9_common_data.h" #include "vp9/common/vp9_enums.h" #include "vp9/common/vp9_filter.h" -#include "vp9/common/vp9_idct.h" #include "vp9/common/vp9_mv.h" #include "vp9/common/vp9_scale.h" #include "vp9/common/vp9_seg_common.h" diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c index b196fc527..5b031752b 100644 --- a/vp9/common/vp9_idct.c +++ b/vp9/common/vp9_idct.c @@ -8,14 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <assert.h> #include <math.h> -#include "./vpx_config.h" #include "./vp9_rtcd.h" #include "vp9/common/vp9_systemdependent.h" #include "vp9/common/vp9_blockd.h" -#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_idct.h" #if CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH diff --git a/vp9/common/vp9_idct.h b/vp9/common/vp9_idct.h index 694be3cf9..1d619824a 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -36,17 +36,6 @@ extern "C" { #define dual_set_epi16(a, b) \ _mm_set_epi16(b, b, b, b, a, a, a, a) -// Note: -// tran_low_t is the datatype used for final transform coefficients. -// tran_high_t is the datatype used for intermediate transform stages. -#if CONFIG_VP9_HIGHBITDEPTH -typedef int64_t tran_high_t; -typedef int32_t tran_low_t; -#else -typedef int32_t tran_high_t; -typedef int16_t tran_low_t; -#endif - // Constants: // for (int i = 1; i< 32; ++i) // printf("static const int cospi_%d_64 = %.0f;\n", i, diff --git a/vp9/common/vp9_rtcd_defs.pl b/vp9/common/vp9_rtcd_defs.pl index 0e95141aa..99460d1a1 100644 --- a/vp9/common/vp9_rtcd_defs.pl +++ b/vp9/common/vp9_rtcd_defs.pl @@ -6,7 +6,6 @@ print <<EOF #include "vpx/vpx_integer.h" #include "vp9/common/vp9_enums.h" -#include "vp9/common/vp9_idct.h" struct macroblockd; diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index ffeefb819..8eee303f4 100644 --- a/vpx/vpx_integer.h +++ b/vpx/vpx_integer.h @@ -63,4 +63,15 @@ typedef size_t uintptr_t; #include <inttypes.h> #endif +// Note: +// tran_low_t is the datatype used for final transform coefficients. +// tran_high_t is the datatype used for intermediate transform stages. +#if CONFIG_VP9_HIGHBITDEPTH && CONFIG_VP9 +typedef int64_t tran_high_t; +typedef int32_t tran_low_t; +#else +typedef int32_t tran_high_t; +typedef int16_t tran_low_t; +#endif + #endif // VPX_VPX_INTEGER_H_ |