diff options
| author | Jingning Han <jingning@google.com> | 2014-09-29 14:53:05 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-09-30 09:11:59 -0700 |
| commit | eafc8c9c40d712aabe234bed5269a02c62fa0bfc (patch) | |
| tree | f1015caf74a1cbad05ebdd346d0517ba302a726d /vp9 | |
| parent | 9ed23de13f0ddfebea2a7ff6caa370126dd84979 (diff) | |
| download | libvpx-eafc8c9c40d712aabe234bed5269a02c62fa0bfc.tar libvpx-eafc8c9c40d712aabe234bed5269a02c62fa0bfc.tar.gz libvpx-eafc8c9c40d712aabe234bed5269a02c62fa0bfc.tar.bz2 libvpx-eafc8c9c40d712aabe234bed5269a02c62fa0bfc.zip | |
Fix compiling error in vp9_idct.h
This commit fixes a compiling error in vp9_idct.h, where the codec
checks that the intermediate steps of transformation fit within
16-bit length. The issue was due to broken file dependency.
Change-Id: Ib22bba13a1e6df28489cb23d6774c561969f1fdc
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_idct.h | 11 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.pl | 1 |
3 files changed, 0 insertions, 13 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.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; |