--- encoder.c	2002/07/10 19:16:32	1.53
+++ encoder.c	2002/07/12 12:26:23	1.55
@@ -32,12 +32,14 @@
  * 
  *  History
  *
- *	20.06.2002 bframe patch
+ *  10.07.2002  added BFRAMES_DEC_DEBUG support
+ *              MinChen <chenm001@163.com>
+ *  20.06.2002 bframe patch
  *  08.05.2002 fix some problem in DEBUG mode;
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.53 2002/07/10 19:16:32 chl Exp $
+ *  $Id: encoder.c,v 1.55 2002/07/12 12:26:23 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -210,7 +212,6 @@
 	if (pParam->max_key_interval == 0)
 		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
 
-
 	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
 	if (pEnc == NULL)
 		return XVID_ERR_MEMORY;
@@ -235,6 +236,10 @@
 
 	pEnc->mbParam.m_quant_type = H263_QUANT;
 
+#ifdef _SMP
+	pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS);
+#endif
+
 	pEnc->sStat.fMvPrevSigma = -1;
 
 	/* Fill rate control parameters */
@@ -1593,20 +1598,18 @@
 	} else {
 
 #ifdef _SMP
-		if (NUMTHREADS > 1)
-			bIntra =
-				SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-							 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-							 iLimit);
-		else
+	if (pEnc->mbParam.num_threads > 1)
+		bIntra =
+			SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+						 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+						 iLimit);
+	else
 #endif
-
-                bIntra =
-                         MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
-                                                    &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-                                                    iLimit);
-		
-	
+		bIntra =
+			MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+                         &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+                         iLimit);
+			
 	}
 	stop_motion_timer();
 
@@ -1740,6 +1743,18 @@
 	IMAGE *f_ref = &pEnc->reference->image;
 	IMAGE *b_ref = &pEnc->current->image;
 
+#ifdef BFRAMES_DEC_DEBUG
+	FILE *fp;
+	static char first=0;
+#define BFRAME_DEBUG  	if (!first && fp){ \
+		fprintf(fp,"Y=%3d   X=%3d   MB=%2d   CBP=%02X\n",y,x,mb->mode,mb->cbp); \
+	}
+
+	if (!first){
+		fp=fopen("C:\\XVIDDBGE.TXT","w");
+	}
+#endif
+
 	// forward 
 	image_setedges(f_ref, pEnc->mbParam.edged_width,
 				   pEnc->mbParam.edged_height, pEnc->mbParam.width,
@@ -1806,6 +1821,11 @@
 			if (mb->mode == MODE_NOT_CODED) {
 				mb->mvs[0].x = 0;
 				mb->mvs[0].y = 0;
+
+				mb->cbp = 0;
+#ifdef BFRAMES_DEC_DEBUG
+	BFRAME_DEBUG
+#endif
 				continue;
 			}
 
@@ -1842,6 +1862,9 @@
 			}
 //			DPRINTF("%05i : [%i %i] M=%i CBP=%i MVS=%i,%i forward=%i,%i", pEnc->m_framenum, x, y, mb->mode, mb->cbp, mb->mvs[0].x, mb->mvs[0].y, forward.x, forward.y);
 
+#ifdef BFRAMES_DEC_DEBUG
+	BFRAME_DEBUG
+#endif
 			start_timer();
 			MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs,
 						 &pEnc->sStat);
@@ -1854,5 +1877,13 @@
 	// TODO: dynamic fcode/bcode ???
 
 	*pBits = BitstreamPos(bs) - *pBits;
+
+#ifdef BFRAMES_DEC_DEBUG
+	if (!first){
+		first=1;
+		if (fp)
+			fclose(fp);
+	}
+#endif
 }
 #endif