Major API change: encapsulate NALs within libx264

[x264] / common / quant.h

diff --git a/common/quant.h b/common/quant.h
index 1024b4f6c516c2e9acf749ac4794d0c6388cc271..b8a7b988aa9ae14bfc6bfd0bdc9a94f062db2133 100644 (file)
--- a/common/quant.h
+++ b/common/quant.h
@@ -25,23 +25,24 @@
 
 typedef struct
 {
-    void (*quant_8x8)( int16_t dct[8][8], uint16_t mf[64], uint16_t bias[64] );
-    void (*quant_4x4)( int16_t dct[4][4], uint16_t mf[16], uint16_t bias[16] );
-    void (*quant_4x4_dc)( int16_t dct[4][4], int mf, int bias );
-    void (*quant_2x2_dc)( int16_t dct[2][2], int mf, int bias );
+    int (*quant_8x8)( int16_t dct[8][8], uint16_t mf[64], uint16_t bias[64] );
+    int (*quant_4x4)( int16_t dct[4][4], uint16_t mf[16], uint16_t bias[16] );
+    int (*quant_4x4_dc)( int16_t dct[4][4], int mf, int bias );
+    int (*quant_2x2_dc)( int16_t dct[2][2], 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_4x4)( int16_t dct[4][4], int dequant_mf[6][4][4], int i_qp );
+    void (*dequant_4x4_dc)( int16_t dct[4][4], int dequant_mf[6][4][4], 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 );
-
 #endif