Moves transform type defines to vp9_common
Moves transform type defines to vp9_common.h from vp9_idct.h so that they can be included in vp9_rtcd_defs.pl safely. Change-Id: Id5106227bee5934f7ce8b06f2eb9fa8a9a2e0ddb
This commit is contained in:
parent
c87f32c7fd
commit
872b207b78
@ -77,8 +77,22 @@ static INLINE uint16_t clip_pixel_high(int val, int bd) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note:
|
||||||
|
// tran_low_t is the datatype used for final transform coefficients.
|
||||||
|
// tran_high_t is the datatype used for intermediate transform stages.
|
||||||
|
typedef int64_t tran_high_t;
|
||||||
|
typedef int32_t tran_low_t;
|
||||||
|
|
||||||
#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)x) << 1))
|
#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)x) << 1))
|
||||||
#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)x) >> 1 ))
|
#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)x) >> 1 ))
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
// Note:
|
||||||
|
// tran_low_t is the datatype used for final transform coefficients.
|
||||||
|
// tran_high_t is the datatype used for intermediate transform stages.
|
||||||
|
typedef int32_t tran_high_t;
|
||||||
|
typedef int16_t tran_low_t;
|
||||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||||
|
|
||||||
#if CONFIG_DEBUG
|
#if CONFIG_DEBUG
|
||||||
|
@ -36,17 +36,6 @@ extern "C" {
|
|||||||
#define dual_set_epi16(a, b) \
|
#define dual_set_epi16(a, b) \
|
||||||
_mm_set_epi16(b, b, b, b, a, a, a, a)
|
_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:
|
// Constants:
|
||||||
// for (int i = 1; i< 32; ++i)
|
// for (int i = 1; i< 32; ++i)
|
||||||
// printf("static const int cospi_%d_64 = %.0f;\n", i,
|
// printf("static const int cospi_%d_64 = %.0f;\n", i,
|
||||||
|
@ -5,8 +5,8 @@ print <<EOF
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "vpx/vpx_integer.h"
|
#include "vpx/vpx_integer.h"
|
||||||
|
#include "vp9/common/vp9_common.h"
|
||||||
#include "vp9/common/vp9_enums.h"
|
#include "vp9/common/vp9_enums.h"
|
||||||
#include "vp9/common/vp9_idct.h"
|
|
||||||
|
|
||||||
struct macroblockd;
|
struct macroblockd;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user