MBAFF: First edge deblocking

[x264] / common / quant.h

diff --git a/common/quant.h b/common/quant.h
index 0d41927b20290945ecb995e681afe517e8056dcd..cf9c8b15a8cc340cef7826a0b54d8cc2875000c3 100644 (file)
--- a/common/quant.h
+++ b/common/quant.h
@@ -1,9 +1,10 @@
 /*****************************************************************************
- * quant.h: h264 encoder library
+ * quant.h: quantization and level-run
  *****************************************************************************
- * Copyright (C) 2005-2008 x264 project
+ * Copyright (C) 2005-2011 x264 project
  *
  * Authors: Loren Merritt <lorenm@u.washington.edu>
+ *          Fiona Glaser <fiona@x264.com>
  *
  * 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,6 +19,9 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
 #ifndef X264_QUANT_H
@@ -25,20 +29,26 @@
 
 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)( dctcoef dct[64], udctcoef mf[64], udctcoef bias[64] );
+    int (*quant_4x4)( dctcoef dct[16], udctcoef mf[16], udctcoef bias[16] );
+    int (*quant_4x4_dc)( dctcoef dct[16], int mf, int bias );
+    int (*quant_2x2_dc)( dctcoef dct[4], int mf, int bias );
+
+    void (*dequant_8x8)( dctcoef dct[64], int dequant_mf[6][64], int i_qp );
+    void (*dequant_4x4)( dctcoef dct[16], int dequant_mf[6][16], int i_qp );
+    void (*dequant_4x4_dc)( dctcoef dct[16], int dequant_mf[6][16], int i_qp );
 
-    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 );
+    int (*optimize_chroma_dc)( dctcoef dct[4], int dequant_mf );
 
-    void (*denoise_dct_core)( int16_t *dct, uint32_t *sum, uint16_t *offset, int size );
+    void (*denoise_dct)( dctcoef *dct, uint32_t *sum, udctcoef *offset, int size );
+
+    int (*decimate_score15)( dctcoef *dct );
+    int (*decimate_score16)( dctcoef *dct );
+    int (*decimate_score64)( dctcoef *dct );
+    int (*coeff_last[6])( dctcoef *dct );
+    int (*coeff_level_run[5])( dctcoef *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