generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiling error in vp9_idct.h

Browse Source 
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
This commit is contained in:
Jingning Han 2014-09-29 14:53:05 -07:00
parent 9ed23de13f
commit eafc8c9c40
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vp9/common/vp9_blockd.h
View File

@ -21,7 +21,6 @@
#include "vp9/common/vp9_common_data.h" #include "vp9/common/vp9_common_data.h"
#include "vp9/common/vp9_enums.h" #include "vp9/common/vp9_enums.h"
#include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_filter.h"
#include "vp9/common/vp9_idct.h"
#include "vp9/common/vp9_mv.h" #include "vp9/common/vp9_mv.h"
#include "vp9/common/vp9_scale.h" #include "vp9/common/vp9_scale.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"

11
vp9/common/vp9_idct.h
View File

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

1
vp9/common/vp9_rtcd_defs.pl
View File

@ -6,7 +6,6 @@ print <<EOF
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_enums.h" #include "vp9/common/vp9_enums.h"
#include "vp9/common/vp9_idct.h"
struct macroblockd; struct macroblockd;

11
vpx/vpx_integer.h
View File

@ -63,4 +63,15 @@ typedef size_t uintptr_t;
#include <inttypes.h> #include <inttypes.h>
#endif #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_ #endif // VPX_VPX_INTEGER_H_