Shrink two arrays
authorHenrik Gramner <hengar-6@student.ltu.se>
Wed, 20 Jul 2011 20:30:59 +0000 (22:30 +0200)
committerJason Garrett-Glaser <jason@x264.com>
Fri, 22 Jul 2011 11:03:16 +0000 (04:03 -0700)
common/dct.c
common/dct.h
encoder/rdo.c

index 38d3be3..0acf685 100644 (file)
@@ -35,8 +35,8 @@
 #   include "arm/dct.h"
 #endif
 
-int x264_dct4_weight2_zigzag[2][16];
-int x264_dct8_weight2_zigzag[2][64];
+uint16_t x264_dct4_weight2_zigzag[2][16];
+uint16_t x264_dct8_weight2_zigzag[2][64];
 
 static void dct4x4dc( dctcoef d[16] )
 {
index 9303d44..a764e49 100644 (file)
@@ -88,8 +88,8 @@ static const uint16_t x264_dct8_weight2_tab[64] = {
 };
 #undef W
 
-extern int x264_dct4_weight2_zigzag[2][16]; // [2] = {frame, field}
-extern int x264_dct8_weight2_zigzag[2][64];
+extern uint16_t x264_dct4_weight2_zigzag[2][16]; // [2] = {frame, field}
+extern uint16_t x264_dct8_weight2_zigzag[2][64];
 
 typedef struct
 {
index 399bf37..36cb468 100644 (file)
@@ -439,7 +439,7 @@ typedef struct
 static ALWAYS_INLINE
 int quant_trellis_cabac( x264_t *h, dctcoef *dct,
                          const udctcoef *quant_mf, const int *unquant_mf,
-                         const int *coef_weight, const uint8_t *zigzag,
+                         const uint16_t *coef_weight, const uint8_t *zigzag,
                          int ctx_block_cat, int i_lambda2, int b_ac,
                          int b_chroma, int dc, int i_coefs, int idx )
 {
@@ -685,7 +685,7 @@ int quant_trellis_cabac( x264_t *h, dctcoef *dct,
 static ALWAYS_INLINE
 int quant_trellis_cavlc( x264_t *h, dctcoef *dct,
                          const udctcoef *quant_mf, const int *unquant_mf,
-                         const int *coef_weight, const uint8_t *zigzag,
+                         const uint16_t *coef_weight, const uint8_t *zigzag,
                          int ctx_block_cat, int i_lambda2, int b_ac,
                          int b_chroma, int dc, int i_coefs, int idx, int b_8x8 )
 {