4:2:2 encoding support

[x264] / encoder / macroblock.h

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index b030755cdef3904e57e8cc141233612ae3d4421e..d8ca95dc513cc2a37f2194ab4ae6ff65ec222ab7 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
- * macroblock.h: h264 encoder library
+ * macroblock.h: macroblock encoding
  *****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: macroblock.h,v 1.1 2004/06/03 19:27:08 fenrir Exp $
+ * Copyright (C) 2003-2011 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,21 +18,55 @@
  *
  * 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.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef _ENCODER_MACROBLOCK_H
-#define _ENCODER_MACROBLOCK_H 1
+#ifndef X264_ENCODER_MACROBLOCK_H
+#define X264_ENCODER_MACROBLOCK_H
+
+#include "common/macroblock.h"
+
+extern const int x264_lambda2_tab[QP_MAX_MAX+1];
+extern const uint16_t x264_lambda_tab[QP_MAX_MAX+1];
+
+void x264_rdo_init( void );
 
-#include "../core/macroblock.h"
+int x264_macroblock_probe_skip( x264_t *h, int b_bidir );
 
-int x264_macroblock_probe_pskip( x264_t *h );
+#define x264_macroblock_probe_pskip( h )\
+    x264_macroblock_probe_skip( h, 0 )
+#define x264_macroblock_probe_bskip( h )\
+    x264_macroblock_probe_skip( h, 1 )
+
+void x264_predict_lossless_4x4( x264_t *h, pixel *p_dst, int p, int idx, int i_mode );
+void x264_predict_lossless_8x8( x264_t *h, pixel *p_dst, int p, int idx, int i_mode, pixel edge[36] );
+void x264_predict_lossless_16x16( x264_t *h, int p, int i_mode );
+void x264_predict_lossless_chroma( x264_t *h, int i_mode );
 
 void x264_macroblock_encode      ( x264_t *h );
-void x264_macroblock_write_cabac ( x264_t *h, bs_t *s );
-void x264_macroblock_write_cavlc ( x264_t *h, bs_t *s );
+void x264_macroblock_write_cabac ( x264_t *h, x264_cabac_t *cb );
+void x264_macroblock_write_cavlc ( x264_t *h );
+
+void x264_macroblock_encode_p8x8( x264_t *h, int i8 );
+void x264_macroblock_encode_p4x4( x264_t *h, int i4 );
+void x264_mb_encode_i4x4( x264_t *h, int p, int idx, int i_qp, int i_mode );
+void x264_mb_encode_i8x8( x264_t *h, int p, int idx, int i_qp, int i_mode, pixel *edge );
+void x264_mb_encode_chroma( x264_t *h, int b_inter, int i_qp );
 
 void x264_cabac_mb_skip( x264_t *h, int b_skip );
 
+int x264_quant_luma_dc_trellis( x264_t *h, dctcoef *dct, int i_quant_cat, int i_qp,
+                                int ctx_block_cat, int b_intra, int idx );
+int x264_quant_chroma_dc_trellis( x264_t *h, dctcoef *dct, int i_qp, int b_intra, int idx );
+int x264_quant_4x4_trellis( x264_t *h, dctcoef *dct, int i_quant_cat,
+                             int i_qp, int ctx_block_cat, int b_intra, int b_chroma, int idx );
+int x264_quant_8x8_trellis( x264_t *h, dctcoef *dct, int i_quant_cat,
+                             int i_qp, int ctx_block_cat, int b_intra, int b_chroma, int idx );
+
+void x264_noise_reduction_update( x264_t *h );
+
 #endif