Fix printing of SEI header with VBV + ABR

[x264] / common / quant.h

diff --git a/common/quant.h b/common/quant.h
index 3294df592f3d013c465715a481de3a10d4a0233b..1cfe95d1018dfb902c2fa5c48ef7a0731bdd8ac0 100644 (file)
--- a/common/quant.h
+++ b/common/quant.h
@@ -1,9 +1,9 @@
 /*****************************************************************************
  * quant.h: h264 encoder library
  *****************************************************************************
- * Copyright (C) 2005 x264 project
+ * Copyright (C) 2005-2008 x264 project
  *
- * Authors: Christian Heine <sennindemokrit@gmx.net>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
  *
  * 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
@@ -17,26 +17,32 @@
  *
  * 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 _QUANT_H
-#define _QUANT_H 1
+#ifndef X264_QUANT_H
+#define X264_QUANT_H
 
 typedef struct
 {
-    void (*quant_8x8_core)( int16_t dct[8][8], int quant_mf[8][8], int i_qbits, int f );
-    void (*quant_4x4_core)( int16_t dct[4][4], int quant_mf[4][4], int i_qbits, int f );
-    void (*quant_4x4_dc_core)( int16_t dct[4][4], int i_quant_mf, int i_qbits, int f );
-    void (*quant_2x2_dc_core)( int16_t dct[2][2], int i_quant_mf, int i_qbits, int f );
+    int (*quant_8x8)( int16_t dct[64], uint16_t mf[64], uint16_t bias[64] );
+    int (*quant_4x4)( int16_t dct[16], uint16_t mf[16], uint16_t bias[16] );
+    int (*quant_4x4_dc)( int16_t dct[16], int mf, int bias );
+    int (*quant_2x2_dc)( int16_t dct[4], int mf, int bias );
 
-    void (*dequant_4x4)( int16_t dct[4][4], int dequant_mf[6][4][4], int i_qp );
-    void (*dequant_8x8)( int16_t dct[8][8], int dequant_mf[6][8][8], int i_qp );
+    void (*dequant_8x8)( int16_t dct[64], int dequant_mf[6][64], int i_qp );
+    void (*dequant_4x4)( int16_t dct[16], int dequant_mf[6][16], int i_qp );
+    void (*dequant_4x4_dc)( int16_t dct[16], int dequant_mf[6][16], int i_qp );
+
+    void (*denoise_dct)( int16_t *dct, uint32_t *sum, uint16_t *offset, int size );
+
+    int (*decimate_score15)( int16_t *dct );
+    int (*decimate_score16)( int16_t *dct );
+    int (*decimate_score64)( int16_t *dct );
+    int (*coeff_last[6])( int16_t *dct );
+    int (*coeff_level_run[5])( int16_t *dct, x264_run_level_t *runlevel );
 } x264_quant_function_t;
 
 void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf );
 
-void x264_mb_dequant_4x4_dc( int16_t dct[4][4], int dequant_mf[6][4][4], int i_qscale );
-void x264_mb_dequant_2x2_dc( int16_t dct[2][2], int dequant_mf[6][4][4], int i_qscale );
-
 #endif