Commit d7e4bed3 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review

Merge "Fix compiling error in vp9_idct.h"

parents 63e49be3 eafc8c9c
......@@ -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"
......
......@@ -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,
......
......@@ -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;
......
......@@ -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_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment