diff options
| author | James Zern <jzern@google.com> | 2014-09-30 15:29:36 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-09-30 16:08:55 -0700 |
| commit | 4a296e6baa1fc2faf9dfcb9b8611fd73bad2c004 (patch) | |
| tree | af6d5eb15774a7264c1d0614cbfb5fd94fa7f3ae /vp9/common | |
| parent | e8a74f4b072f65a700ea44af84520c49da9ef1b2 (diff) | |
| download | libvpx-4a296e6baa1fc2faf9dfcb9b8611fd73bad2c004.tar libvpx-4a296e6baa1fc2faf9dfcb9b8611fd73bad2c004.tar.gz libvpx-4a296e6baa1fc2faf9dfcb9b8611fd73bad2c004.tar.bz2 libvpx-4a296e6baa1fc2faf9dfcb9b8611fd73bad2c004.zip | |
Revert "Fix compiling error in vp9_idct.h"
This reverts commit eafc8c9c40d712aabe234bed5269a02c62fa0bfc.
tran_low_t/tran_high_t don't belong in a public header, they're private.
Similarly the public headers shouldn't rely on config defines,
vpx_config.h isn't installed.
Change-Id: I194ec273598da418df8dd727b6c0e78a556740ad
Diffstat (limited to 'vp9/common')
| -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, 13 insertions, 0 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 03ab2257e..702efe07b 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -21,6 +21,7 @@ #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 1d619824a..694be3cf9 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -36,6 +36,17 @@ 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 99460d1a1..0e95141aa 100644 --- a/vp9/common/vp9_rtcd_defs.pl +++ b/vp9/common/vp9_rtcd_defs.pl @@ -6,6 +6,7 @@ print <<EOF #include "vpx/vpx_integer.h" #include "vp9/common/vp9_enums.h" +#include "vp9/common/vp9_idct.h" struct macroblockd; |