--- branches/dev-api-3/xvidcore/src/bitstream/mbcoding.c	2002/09/23 20:36:02	530
+++ branches/dev-api-3/xvidcore/src/bitstream/mbcoding.c	2002/11/03 01:43:32	622
@@ -41,6 +41,7 @@
   *																			   *	
   *  Revision history:                                                         *
   *                                                                            *
+  *  28.10.2002	GMC support - gruel											   *
   *  28.06.2002 added check_resync_marker()                                    *
   *  14.04.2002 bframe encoding												   *
   *  08.03.2002 initial version; isibaar					                   *
@@ -67,6 +68,22 @@
 VLC DCT3Dintra[4096];
 VLC DCT3Dinter[4096];
 
+/* not really MB related, but VLCs are only available here */
+void bs_put_spritetrajectory(Bitstream * bs, const int val)
+{
+	const int code = sprite_trajectory_code[val+16384].code;
+	const int len = sprite_trajectory_code[val+16384].len;
+	const int code2 = sprite_trajectory_len[len].code;
+	const int len2 = sprite_trajectory_len[len].len;
+
+//	printf("GMC=%d Code/Len  = %d / %d ",val, code,len);
+//	printf("Code2 / Len2 = %d / %d \n",code2,len2);
+
+	BitstreamPutBits(bs, code2, len2);
+	if (len) BitstreamPutBits(bs, code, len);
+}
+
+
 void
 init_vlc_tables(void)
 {
@@ -183,6 +200,28 @@
 	DCT3D[0] = DCT3Dinter;
 	DCT3D[1] = DCT3Dintra;
 
+
+/* init sprite_trajectory tables */
+/* even if GMC is not specified (it might be used later...) */
+
+	sprite_trajectory_code[0+16384].code = 0;
+	sprite_trajectory_code[0+16384].len = 0;
+	for (k=0;k<14;k++)
+	{
+		int limit = (1<<k);
+
+		for (i=-(2*limit-1); i<= -limit; i++)
+		{
+			sprite_trajectory_code[i+16384].code = (2*limit-1)+i;
+			sprite_trajectory_code[i+16384].len = k+1;
+		}
+
+		for (i=limit; i<= 2*limit-1; i++)
+		{
+			sprite_trajectory_code[i+16384].code = i; 
+			sprite_trajectory_code[i+16384].len = k+1;
+		}
+	}
 }
 
 static __inline void
@@ -281,7 +320,7 @@
 
 
 static __inline void
-CodeBlockIntra(const FRAMEINFO * frame,
+CodeBlockIntra(const FRAMEINFO * const frame,
 			   const MACROBLOCK * pMB,
 			   int16_t qcoeff[6 * 64],
 			   Bitstream * bs,
@@ -330,10 +369,13 @@
 							 dcc_tab[qcoeff[i * 64 + 0] + 255].len);
 
 		if (pMB->cbp & (1 << (5 - i))) {
+			const uint16_t *scan_table =
+				frame->global_flags & XVID_ALTERNATESCAN ?
+				scan_tables[2] : scan_tables[pMB->acpred_directions[i]];
+
 			bits = BitstreamPos(bs);
 
-			CodeCoeff(bs, &qcoeff[i * 64], intra_table,
-					  scan_tables[pMB->acpred_directions[i]], 1);
+			CodeCoeff(bs, &qcoeff[i * 64], intra_table, scan_table, 1);
 
 			bits = BitstreamPos(bs) - bits;
 			pStat->iTextBits += bits;
@@ -344,7 +386,7 @@
 
 
 static void
-CodeBlockInter(const FRAMEINFO * frame,
+CodeBlockInter(const FRAMEINFO * const frame,
 			   const MACROBLOCK * pMB,
 			   int16_t qcoeff[6 * 64],
 			   Bitstream * bs,
@@ -353,6 +395,7 @@
 
 	int32_t i;
 	uint32_t bits, mcbpc, cbpy;
+	int mcsel=0;
 
 	mcbpc = (pMB->mode & 7) | ((pMB->cbp & 3) << 3);
 	cbpy = 15 - (pMB->cbp >> 2);
@@ -361,6 +404,18 @@
 	BitstreamPutBits(bs, mcbpc_inter_tab[mcbpc].code,
 					 mcbpc_inter_tab[mcbpc].len);
 
+	if ( (frame->coding_type == S_VOP) && (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) )
+	{
+		if (frame->quarterpel) {
+			if ( (pMB->qmvs[0].x == frame->GMC_MV.x) && (pMB->qmvs[0].y == frame->GMC_MV.y) )
+				mcsel=1;
+		} else {
+			if ( (pMB->mvs[0].x == frame->GMC_MV.x) && (pMB->mvs[0].y == frame->GMC_MV.y) )
+				mcsel=1;	
+		}
+		BitstreamPutBit(bs, mcsel);		// mcsel: '0'=local motion, '1'=GMC
+	}
+
 	// write cbpy
 	BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len);
 
@@ -387,37 +442,41 @@
 			}
 		}
 	}
-	// code motion vector(s)
-	for (i = 0; i < (pMB->mode == MODE_INTER4V ? 4 : 1); i++) {
-		CodeVector(bs, pMB->pmvs[i].x, frame->fcode, pStat);
-		CodeVector(bs, pMB->pmvs[i].y, frame->fcode, pStat);
-	}
+	// code motion vector(s) if motion is local 
+	if (mcsel==0)
+		for (i = 0; i < (pMB->mode == MODE_INTER4V ? 4 : 1); i++) {
+			CodeVector(bs, pMB->pmvs[i].x, frame->fcode, pStat);
+			CodeVector(bs, pMB->pmvs[i].y, frame->fcode, pStat);
+		}
 
 	bits = BitstreamPos(bs);
 
 	// code block coeffs
 	for (i = 0; i < 6; i++)
 		if (pMB->cbp & (1 << (5 - i)))
-			CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[0], 0);
+		{
+			const uint16_t *scan_table =
+				frame->global_flags & XVID_ALTERNATESCAN ?
+				scan_tables[2] : scan_tables[0];
+
+			CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_table, 0);
+		}
 
 	bits = BitstreamPos(bs) - bits;
 	pStat->iTextBits += bits;
-
 }
 
 
 void
-MBCoding(const FRAMEINFO * frame,
+MBCoding(const FRAMEINFO * const frame,
 		 MACROBLOCK * pMB,
 		 int16_t qcoeff[6 * 64],
 		 Bitstream * bs,
 		 Statistics * pStat)
 {
-
-	if (frame->coding_type == P_VOP) {
-			BitstreamPutBit(bs, 0);	// coded
-	}
-
+	if (frame->coding_type != I_VOP)  
+			BitstreamPutBit(bs, 0);	// not_coded
+			
 	if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q)
 		CodeBlockIntra(frame, pMB, qcoeff, bs, pStat);
 	else
@@ -502,7 +561,8 @@
 			 const int32_t fcode,
 			 const int32_t bcode,
 			 Bitstream * bs,
-			 Statistics * pStat)
+			 Statistics * pStat,
+			 int direction)
 {
 	int vcode = fcode;
 	unsigned int i;
@@ -553,7 +613,7 @@
 
 	for (i = 0; i < 6; i++) {
 		if (mb->cbp & (1 << (5 - i))) {
-			CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[0], 0);
+			CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[direction], 0);
 		}
 	}
 }
@@ -777,10 +837,11 @@
 
 void
 get_inter_block(Bitstream * bs,
-				int16_t * block)
+				int16_t * block,
+				int direction)
 {
 
-	const uint16_t *scan = scan_tables[0];
+	const uint16_t *scan = scan_tables[direction];
 	int p;
 	int level;
 	int run;