Fix some invalid reads caught by valgrind

[x264] / encoder / macroblock.h

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index d52668c6a4b6081b52049bd380d114d14a2325c9..36cd0e0eadca18607055d0e0008015eda99a3d2d 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * macroblock.h: h264 encoder library
  *****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: macroblock.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
  *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
+ *          Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,15 +18,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ENCODER_MACROBLOCK_H
-#define _ENCODER_MACROBLOCK_H 1
+#ifndef X264_ENCODER_MACROBLOCK_H
+#define X264_ENCODER_MACROBLOCK_H
 
 #include "common/macroblock.h"
 
-void x264_rdo_init( );
+extern const int x264_lambda2_tab[52];
+extern const int x264_lambda_tab[52];
+
+void x264_rdo_init( void );
 
 int x264_macroblock_probe_skip( x264_t *h, int b_bidir );
 
@@ -35,48 +38,31 @@ static inline int x264_macroblock_probe_pskip( x264_t *h )
 static inline int x264_macroblock_probe_bskip( x264_t *h )
     { return x264_macroblock_probe_skip( h, 1 ); }
 
+void x264_predict_lossless_8x8_chroma( x264_t *h, int i_mode );
+void x264_predict_lossless_4x4( x264_t *h, uint8_t *p_dst, int idx, int i_mode );
+void x264_predict_lossless_8x8( x264_t *h, uint8_t *p_dst, int idx, int i_mode, uint8_t edge[33] );
+void x264_predict_lossless_16x16( x264_t *h, int i_mode );
+
 void x264_macroblock_encode      ( x264_t *h );
 void x264_macroblock_write_cabac ( x264_t *h, x264_cabac_t *cb );
 void x264_macroblock_write_cavlc ( x264_t *h, bs_t *s );
 
 void x264_macroblock_encode_p8x8( x264_t *h, int i8 );
-void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qscale );
-void x264_mb_encode_i8x8( x264_t *h, int idx, int i_qscale );
-void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale );
+void x264_macroblock_encode_p4x4( x264_t *h, int i4 );
+void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qp );
+void x264_mb_encode_i8x8( x264_t *h, int idx, int i_qp );
+void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qp );
 
 void x264_cabac_mb_skip( x264_t *h, int b_skip );
 
-void x264_quant_4x4_trellis( x264_t *h, int16_t dct[4][4], int i_quant_cat,
-                             int i_qp, int i_ctxBlockCat, int b_intra );
-void x264_quant_8x8_trellis( x264_t *h, int16_t dct[8][8], int i_quant_cat,
-                             int i_qp, int b_intra );
+int x264_quant_dc_trellis( x264_t *h, int16_t *dct, int i_quant_cat,
+                             int i_qp, int i_ctxBlockCat, int b_intra, int b_chroma );
+int x264_quant_4x4_trellis( x264_t *h, int16_t *dct, int i_quant_cat,
+                             int i_qp, int i_ctxBlockCat, int b_intra, int b_chroma, int idx );
+int x264_quant_8x8_trellis( x264_t *h, int16_t *dct, int i_quant_cat,
+                             int i_qp, int b_intra, int idx );
 
 void x264_noise_reduction_update( x264_t *h );
-void x264_denoise_dct( x264_t *h, int16_t *dct );
-
-#define array_non_zero(a) array_non_zero_int(a, sizeof(a))
-static inline int array_non_zero_int( void *v, int i_count )
-{
-    int i;
-    uint32_t *x = v;
-    i_count /= sizeof(uint32_t);
-    for( i = 0; i < i_count; i++ )
-        if( x[i] ) return 1;
-    return 0;
-}
-
-static inline int array_non_zero_count( int *v, int i_count )
-{
-    int i;
-    int i_nz;
-
-    for( i = 0, i_nz = 0; i < i_count; i++ )
-        if( v[i] )
-            i_nz++;
-
-    return i_nz;
-}
-
 
 #endif