--- trunk/xvidcore/src/encoder.c	2002/06/25 09:41:54	240
+++ trunk/xvidcore/src/encoder.c	2002/07/10 19:16:32	284
@@ -37,7 +37,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.49 2002-06-25 09:41:53 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.53 2002-07-10 19:16:32 chl Exp $
  *
  ****************************************************************************/
 
@@ -66,6 +66,9 @@
 #include "quant/quant_matrix.h"
 #include "utils/mem_align.h"
 
+#ifdef _SMP
+#include "motion/smp_motion_est.h"
+#endif 
 /*****************************************************************************
  * Local macros
  ****************************************************************************/
@@ -625,11 +628,11 @@
 {
 	if (pEnc->queue_size >= pEnc->mbParam.max_bframes)
 	{
-		DPRINTF("FATAL: QUEUE FULL");
+		DPRINTF(DPRINTF_DEBUG,"FATAL: QUEUE FULL");
 		return;
 	}
 
-	DPRINTF("*** QUEUE bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+	DPRINTF(DPRINTF_DEBUG,"*** QUEUE bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -697,7 +700,7 @@
 			 * frame as a pframe
 			 */
 
-			DPRINTF("*** BFRAME (final frame) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+			DPRINTF(DPRINTF_DEBUG,"*** BFRAME (final frame) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -716,7 +719,7 @@
 		}
 
 		
-		DPRINTF("*** BFRAME (flush) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -738,7 +741,7 @@
 
 		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
 			
-			DPRINTF("*** EMPTY bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+			DPRINTF(DPRINTF_DEBUG,"*** EMPTY bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -808,7 +811,7 @@
 
 	} else if (BitstreamPos(&bs) == 0) {
 
-		DPRINTF("*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -924,7 +927,7 @@
 		 * This will be coded as an Intra Frame
 		 */
 
-		DPRINTF("*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 		
@@ -972,7 +975,7 @@
 		 * This will be coded as a Predicted Frame
 		 */
 
-		DPRINTF("*** PFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** PFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 		
@@ -995,7 +998,7 @@
 		 * This will be coded as a Bidirectional Frame
 		 */
 
-		DPRINTF("*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+		DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
@@ -1312,9 +1315,8 @@
 				&pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
 			MVBLOCKHINT *bhint =
 				&hint->mvhint.block[x + y * pEnc->mbParam.mb_width];
-			VECTOR pred[4];
+			VECTOR pred;
 			VECTOR tmp;
-			int32_t dummy[4];
 			int vec;
 
 			pMB->mode =
@@ -1334,14 +1336,13 @@
 				tmp.x -= (tmp.x >= high) ? high * 2 : 0;
 				tmp.y -= (tmp.y >= high) ? high * 2 : 0;
 
-				get_pmvdata(pEnc->current->mbs, x, y, pEnc->mbParam.mb_width,
-							0, pred, dummy);
+				pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,0);
 
 				for (vec = 0; vec < 4; ++vec) {
 					pMB->mvs[vec].x = tmp.x;
 					pMB->mvs[vec].y = tmp.y;
-					pMB->pmvs[vec].x = pMB->mvs[0].x - pred[0].x;
-					pMB->pmvs[vec].y = pMB->mvs[0].y - pred[0].y;
+					pMB->pmvs[vec].x = pMB->mvs[0].x - pred.x;
+					pMB->pmvs[vec].y = pMB->mvs[0].y - pred.y;
 				}
 			} else if (pMB->mode == MODE_INTER4V) {
 				for (vec = 0; vec < 4; ++vec) {
@@ -1354,13 +1355,12 @@
 					tmp.x -= (tmp.x >= high) ? high * 2 : 0;
 					tmp.y -= (tmp.y >= high) ? high * 2 : 0;
 
-					get_pmvdata(pEnc->current->mbs, x, y,
-								pEnc->mbParam.mb_width, vec, pred, dummy);
+					pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,vec);
 
 					pMB->mvs[vec].x = tmp.x;
 					pMB->mvs[vec].y = tmp.y;
-					pMB->pmvs[vec].x = pMB->mvs[vec].x - pred[0].x;
-					pMB->pmvs[vec].y = pMB->mvs[vec].y - pred[0].y;
+					pMB->pmvs[vec].x = pMB->mvs[vec].x - pred.x;
+					pMB->pmvs[vec].y = pMB->mvs[vec].y - pred.y;
 				}
 			} else				// intra / stuffing / not_coded
 			{
@@ -1591,10 +1591,22 @@
 	if (pEnc->current->global_flags & XVID_HINTEDME_SET) {
 		HintedMESet(pEnc, &bIntra);
 	} else {
-		bIntra =
-			MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
+
+#ifdef _SMP
+		if (NUMTHREADS > 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);
+		
+	
 	}
 	stop_motion_timer();