--- encoder.c	2003/12/12 14:16:40	1.95.2.58
+++ encoder.c	2004/02/16 03:40:47	1.95.2.64
@@ -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.58 2003/12/12 14:16:40 edgomez Exp $
+ * $Id: encoder.c,v 1.95.2.64 2004/02/16 03:40:47 syskin Exp $
  *
  ****************************************************************************/
 
@@ -652,7 +652,7 @@
 		data.max_quant[i] = pEnc->mbParam.max_quant[i];
 	}
 
-	data.reference.csp = XVID_CSP_USER;
+	data.reference.csp = XVID_CSP_PLANAR;
 	data.reference.plane[0] = pEnc->reference->image.y;
 	data.reference.plane[1] = pEnc->reference->image.u;
 	data.reference.plane[2] = pEnc->reference->image.v;
@@ -660,7 +660,7 @@
 	data.reference.stride[1] = pEnc->mbParam.edged_width/2;
 	data.reference.stride[2] = pEnc->mbParam.edged_width/2;
 
-	data.current.csp = XVID_CSP_USER;
+	data.current.csp = XVID_CSP_PLANAR;
 	data.current.plane[0] = frame->image.y;
 	data.current.plane[1] = frame->image.u;
 	data.current.plane[2] = frame->image.v;
@@ -690,7 +690,7 @@
 	
 	} else { /* XVID_PLG_AFTER */
 		if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) {
-			data.original.csp = XVID_CSP_USER;
+			data.original.csp = XVID_CSP_PLANAR;
 			data.original.plane[0] = original->y;
 			data.original.plane[1] = original->u;
 			data.original.plane[2] = original->v;
@@ -740,20 +740,22 @@
 		data.mblks = frame->sStat.mblks;
 		data.ublks = frame->sStat.ublks;
 
-		if (stats) {
-			stats->type = coding2type(frame->coding_type);
-			stats->quant = frame->quant;
-			stats->vol_flags = frame->vol_flags;
-			stats->vop_flags = frame->vop_flags;
-			stats->length = frame->length;
-			stats->hlength = frame->length - (frame->sStat.iTextBits / 8);
-			stats->kblks = frame->sStat.kblks;
-			stats->mblks = frame->sStat.mblks;
-			stats->ublks = frame->sStat.ublks;
-			stats->sse_y = data.sse_y;
-			stats->sse_u = data.sse_u;
-			stats->sse_v = data.sse_v;
-		}
+		/* New code */
+		data.stats.type      = coding2type(frame->coding_type);
+		data.stats.quant     = frame->quant;
+		data.stats.vol_flags = frame->vol_flags;
+		data.stats.vop_flags = frame->vop_flags;
+		data.stats.length    = frame->length;
+		data.stats.hlength   = frame->length - (frame->sStat.iTextBits / 8);
+		data.stats.kblks     = frame->sStat.kblks;
+		data.stats.mblks     = frame->sStat.mblks;
+		data.stats.ublks     = frame->sStat.ublks;
+		data.stats.sse_y     = data.sse_y;
+		data.stats.sse_u     = data.sse_u;
+		data.stats.sse_v     = data.sse_v;
+
+		if (stats)
+			*stats = data.stats;
 	}
 
 	/* call plugins */
@@ -1119,7 +1121,7 @@
 
 	pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;
 	inc_frame_num(pEnc);
-	pEnc->current->vol_flags = pEnc->mbParam.vol_flags;
+	pEnc->current->vol_flags = frame->vol_flags;
 	pEnc->current->vop_flags = frame->vop_flags;
 	pEnc->current->motion_flags = frame->motion;
 	pEnc->current->fcode = pEnc->mbParam.m_fcode;
@@ -1154,6 +1156,9 @@
 		}
 	}
 
+	if (type != I_VOP) 
+		pEnc->current->vol_flags = pEnc->mbParam.vol_flags; /* don't allow VOL changes here */
+
 	/* bframes buffer overflow check */
 	if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {
 		type = P_VOP;
@@ -1266,7 +1271,7 @@
 		pEnc->iFrameNum = 1;
 
 		/* ---- update vol flags at IVOP ----------- */
-		pEnc->current->vol_flags = pEnc->mbParam.vol_flags = frame->vol_flags;
+		pEnc->mbParam.vol_flags = pEnc->current->vol_flags;
 
 		/* Aspect ratio */
 		switch(frame->par) {
@@ -1435,7 +1440,7 @@
 		start_timer();
 		image_setedges(&pEnc->current->image,
 			pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
-			pEnc->mbParam.width, pEnc->mbParam.height);
+			pEnc->mbParam.width, pEnc->mbParam.height, 0);
 		stop_edges_timer();
 	}
 
@@ -1447,7 +1452,7 @@
 
 	SetMacroblockQuants(&pEnc->mbParam, pEnc->current);
 
-	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
+	BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
 
 	set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
 
@@ -1546,7 +1551,7 @@
 	if (!reference->is_edged) {	
 		start_timer();
 		image_setedges(pRef, pParam->edged_width, pParam->edged_height,
-					   pParam->width, pParam->height);
+					   pParam->width, pParam->height, 0);
 		stop_edges_timer();
 		reference->is_edged = 1;
 	}
@@ -1642,7 +1647,7 @@
 
 	set_timecodes(current,reference,pParam->fbase);
 	if (vol_header)
-	{	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
+	{	BitstreamWriteVolHeader(bs, &pEnc->mbParam, current);
 		BitstreamPad(bs);
 	}
 
@@ -1944,7 +1949,7 @@
 	if (!pEnc->reference->is_edged) {
 		image_setedges(f_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height);
+					   pEnc->mbParam.height, 0);
 		pEnc->current->is_edged = 1;	
 	}
 
@@ -1961,7 +1966,7 @@
 	if (!pEnc->current->is_edged) {
 		image_setedges(b_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height);
+					   pEnc->mbParam.height, 0);
 		pEnc->current->is_edged = 1;
 	}