Revert "Fix compiling error in vp9_idct.h"

This reverts commit eafc8c9c40.

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
This commit is contained in:
James Zern 2014-09-30 15:29:36 -07:00
Родитель e8a74f4b07
Коммит 4a296e6baa
4 изменённых файлов: 13 добавлений и 11 удалений

Просмотреть файл

@ -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"

Просмотреть файл

@ -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,

Просмотреть файл

@ -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;

Просмотреть файл

@ -63,15 +63,4 @@ 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_