--- encoder.c	2003/08/02 15:08:19	1.95.2.36
+++ encoder.c	2003/09/29 00:30:31	1.95.2.41
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: encoder.c,v 1.95.2.36 2003/08/02 15:08:19 edgomez Exp $
+ * $Id: encoder.c,v 1.95.2.41 2003/09/29 00:30:31 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -115,7 +115,7 @@
 enc_create(xvid_enc_create_t * create)
 {
 	Encoder *pEnc;
-    int n;
+  int n;
 
 	if (XVID_VERSION_MAJOR(create->version) != 1) /* v1.x.x */
 		return XVID_ERR_VERSION;
@@ -226,8 +226,7 @@
 	pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0);
 
     /* max keyframe interval */
-    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ?
-		(10 * pEnc->mbParam.fbase) / pEnc->mbParam.fincr : create->max_key_interval;
+    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ? (10 * (int)pEnc->mbParam.fbase) / (int)pEnc->mbParam.fincr : create->max_key_interval;
 
     /* allocate working frame-image memory */
 
@@ -390,16 +389,13 @@
 		image_null(&pEnc->queue[n].image);
 
 		
-	for (n = 0; n < pEnc->mbParam.max_bframes+1; n++)
-	{
+	for (n = 0; n < pEnc->mbParam.max_bframes+1; n++) {
 		if (image_create
 			(&pEnc->queue[n].image, pEnc->mbParam.edged_width,
 			 pEnc->mbParam.edged_height) < 0)
 			goto xvid_err_memory5;
-
 	}
 
-
 	/* timestamp stuff */
 
 	pEnc->mbParam.m_stamp = 0;
@@ -424,15 +420,12 @@
 
   xvid_err_memory5:
 
-	if (pEnc->mbParam.max_bframes > 0) {
-        int i;
-
-		for (i = 0; i < pEnc->mbParam.max_bframes+1; i++) {
-			image_destroy(&pEnc->queue[i].image, pEnc->mbParam.edged_width,
+	for (n = 0; n < pEnc->mbParam.max_bframes+1; n++) {
+			image_destroy(&pEnc->queue[n].image, pEnc->mbParam.edged_width,
 						  pEnc->mbParam.edged_height);
 		}
-		xvid_free(pEnc->queue);
-	}
+
+	xvid_free(pEnc->queue);
 
   xvid_err_memory4:
 
@@ -446,11 +439,8 @@
 
 			image_destroy(&pEnc->bframes[i]->image, pEnc->mbParam.edged_width,
 						  pEnc->mbParam.edged_height);
-	
 			xvid_free(pEnc->bframes[i]->mbs);
-	
 			xvid_free(pEnc->bframes[i]);
-
 		}	
 
 		xvid_free(pEnc->bframes);
@@ -539,16 +529,12 @@
 	int i;
 	
 	/* B Frames specific */
-	if (pEnc->mbParam.max_bframes > 0) {
-
-		for (i = 0; i < pEnc->mbParam.max_bframes+1; i++) {
-		
-			image_destroy(&pEnc->queue[i].image, pEnc->mbParam.edged_width,
+	for (i = 0; i < pEnc->mbParam.max_bframes+1; i++) {
+		image_destroy(&pEnc->queue[i].image, pEnc->mbParam.edged_width,
 					  pEnc->mbParam.edged_height);
-		}
-		xvid_free(pEnc->queue);
 	}
 
+	xvid_free(pEnc->queue);
 
 	if (pEnc->mbParam.max_bframes > 0) {
 
@@ -559,9 +545,7 @@
 
 			image_destroy(&pEnc->bframes[i]->image, pEnc->mbParam.edged_width,
 					  pEnc->mbParam.edged_height);
-
 			xvid_free(pEnc->bframes[i]->mbs);
-
 			xvid_free(pEnc->bframes[i]);
 		}
 
@@ -771,7 +755,7 @@
     }
 
     /* call plugins */
-    for (i=0; i<pEnc->num_plugins;i++) {
+    for (i=0; i<(unsigned int)pEnc->num_plugins;i++) {
         emms();
         if (pEnc->plugins[i].func) {
             if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) {
@@ -1200,6 +1184,21 @@
 
 		/* ---- update vol flags at IVOP ----------- */
 		pEnc->current->vol_flags = pEnc->mbParam.vol_flags = frame->vol_flags;
+		switch(frame->par) {
+		case XVID_PAR_11_VGA:
+		case XVID_PAR_43_PAL:
+		case XVID_PAR_43_NTSC:
+		case XVID_PAR_169_PAL:
+		case XVID_PAR_169_NTSC:
+		case XVID_PAR_EXT:
+			pEnc->mbParam.par = frame->par;
+			break;
+		default:
+			pEnc->mbParam.par = XVID_PAR_EXT;
+			break;
+		}
+		pEnc->mbParam.par_width = (frame->par_width)?frame->par_width:1;
+		pEnc->mbParam.par_height = (frame->par_height)?frame->par_height:1;
 
         if ((pEnc->mbParam.vol_flags & XVID_VOL_MPEGQUANT)) {
 			if (frame->quant_intra_matrix != NULL)
@@ -1253,7 +1252,7 @@
 	 * on next enc_encode call we must flush bframes
 	 * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
 
-done_flush:
+/*done_flush:*/
 
     pEnc->flush_bframes = 1;
 
@@ -1285,6 +1284,10 @@
 {
     unsigned int i,j;
     int quant = frame->quant;
+    if (quant > 31)
+		frame->quant = quant = 31;
+	else if (quant < 1)
+		frame->quant = quant = 1;
 
     for (j=0; j<pParam->mb_height; j++)
     for (i=0; i<pParam->mb_width; i++) {
@@ -1292,7 +1295,7 @@
         quant += pMB->dquant;
         if (quant > 31)
 			quant = 31;
-		if (quant < 1)
+		else if (quant < 1)
 			quant = 1;
         pMB->quant = quant;
     }
@@ -1565,6 +1568,11 @@
 
 				current->sStat.kblks++;
 
+				if (pEnc->current->vop_flags & XVID_VOP_GREYSCALE)
+				{	pMB->cbp &= 0x3C;		/* keep only bits 5-2 */
+					qcoeff[4*64+0]=0;		/* zero, because for INTRA MBs DC value is saved */
+					qcoeff[5*64+0]=0;
+				}
 				MBCoding(current, pMB, qcoeff, bs, &current->sStat);
 				stop_coding_timer();
 				continue;
@@ -1891,9 +1899,12 @@
 				}
 			}
 
-#ifdef BFRAMES_DEC_DEBUG
-	BFRAME_DEBUG
-#endif
+			/* keep only bits 5-2 -- Chroma blocks will just be skipped by the
+			 * coding function for BFrames, that's why we don't zero teh DC
+			 * coeffs */
+			if ((frame->vop_flags & XVID_VOP_GREYSCALE))
+				mb->cbp &= 0x3C;
+
 			start_timer();
 			MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs,
 						 &frame->sStat, direction);