shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Moves transform type defines to vp9_common"

--- a/vp9/common/vp9_common.h

+++ b/vp9/common/vp9_common.h

@@ -77,8 +77,22 @@

   }

 }

+// 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_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

 #if CONFIG_DEBUG

--- a/vp9/common/vp9_idct.h

+++ b/vp9/common/vp9_idct.h

@@ -36,17 +36,6 @@

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

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -5,8 +5,8 @@

  */

 #include "vpx/vpx_integer.h"

+#include "vp9/common/vp9_common.h"

 #include "vp9/common/vp9_enums.h"

-#include "vp9/common/vp9_idct.h"

 struct macroblockd;