--- trunk/xvidcore/src/bitstream/mbcoding.h	2002/06/30 10:46:29	252
+++ branches/dev-api-4/xvidcore/src/bitstream/mbcoding.h	2003/06/09 13:55:56	1054
@@ -1,14 +1,43 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - MB coding header  -
+ *
+ *  Copyright (C) 2002 Michael Militzer <isibaar@xvid.org>
+ *
+ *  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
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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-1307 USA
+ *
+ * $Id: mbcoding.h,v 1.11.2.4 2003-06-09 13:52:20 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _MB_CODING_H_
 #define _MB_CODING_H_
 
 #include "../portab.h"
 #include "../global.h"
+#include "vlc_codes.h"
 #include "bitstream.h"
 
 void init_vlc_tables(void);
 
 int check_resync_marker(Bitstream * bs, int addbits);
 
+void bs_put_spritetrajectory(Bitstream * bs, const int val);
+int bs_get_spritetrajectory(Bitstream * bs);
+
 int get_mcbpc_intra(Bitstream * bs);
 int get_mcbpc_inter(Bitstream * bs);
 int get_cbpy(Bitstream * bs,
@@ -21,18 +50,13 @@
 int get_dc_size_lum(Bitstream * bs);
 int get_dc_size_chrom(Bitstream * bs);
 
-int get_coeff(Bitstream * bs,
-			  int *run,
-			  int *last,
-			  int intra,
-			  int short_video_header);
-
 void get_intra_block(Bitstream * bs,
 					 int16_t * block,
 					 int direction,
 					 int coeff);
 void get_inter_block(Bitstream * bs,
-					 int16_t * block);
+					 int16_t * block,
+					 int direction);
 
 
 void MBCodingBVOP(const MACROBLOCK * mb,
@@ -40,6 +64,22 @@
 				  const int32_t fcode,
 				  const int32_t bcode,
 				  Bitstream * bs,
-				  Statistics * pStat);
+				  Statistics * pStat,
+				  int alternate_scan);
+
+
+static __inline void
+MBSkip(Bitstream * bs)
+{
+	BitstreamPutBit(bs, 1);	/* not coded */
+}
+
+
+#ifdef BIGLUT
+extern VLC *intra_table;
+int CodeCoeff_CalcBits(const int16_t qcoeff[64], VLC * table, const uint16_t * zigzag, uint16_t intra);
+#else
+int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag);
+#endif
 
 #endif							/* _MB_CODING_H_ */