--- trunk/xvidcore/vfw/src/codec.c	2004/10/25 10:29:10	1558
+++ trunk/xvidcore/vfw/src/codec.c	2005/03/27 03:59:42	1607
@@ -502,6 +502,15 @@
 		pass2.kfthreshold = codec->config.kfthreshold;
 		pass2.container_frame_overhead = 24;	/* AVI */
 
+		/* VBV */
+		pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
+		pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
+		pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
+
+    // XXX: xvidcore current provides a "peak bits over 3secs" constraint.
+    //      according to the latest dxn literature, a 1sec constraint is now used
+    pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;
+
 		plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
 		plugins[create.num_plugins].param = &pass2;
 		create.num_plugins++;
@@ -557,18 +566,33 @@
 	create.max_quant[2] = codec->config.max_bquant;
 
 	if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {
-		create.max_bframes = codec->config.max_bframes;
-		create.bquant_ratio = codec->config.bquant_ratio;
-		create.bquant_offset = codec->config.bquant_offset;
 
-		if (codec->config.packed) 
-			create.global |= XVID_GLOBAL_PACKED;
+    /* dxn: prevent bframes usage if interlacing is selected */
+    if (!((profiles[codec->config.profile].flags & PROFILE_DXN) && codec->config.interlacing)) {
+      create.max_bframes = codec->config.max_bframes;
+		  create.bquant_ratio = codec->config.bquant_ratio;
+		  create.bquant_offset = codec->config.bquant_offset;
+
+		  if (codec->config.packed) 
+			  create.global |= XVID_GLOBAL_PACKED;
+
+		  create.global |= XVID_GLOBAL_CLOSED_GOP;
 
-		if (codec->config.closed_gov) 
-			create.global |= XVID_GLOBAL_CLOSED_GOP;
+      /* dxn: restrict max bframes and enable packed bframes */
+      if ((profiles[codec->config.profile].flags & PROFILE_DXN)) {
 
+        if (create.max_bframes > profiles[codec->config.profile].dxn_max_bframes)
+          create.max_bframes = profiles[codec->config.profile].dxn_max_bframes;
+
+        create.global |= XVID_GLOBAL_PACKED;
+      }
+    }
 	}
 
+  /* dxn: always write divx5 userdata */
+  if ((profiles[codec->config.profile].flags & PROFILE_DXN))
+    create.global |= XVID_GLOBAL_DIVX5_USERDATA;
+
 	create.frame_drop_ratio = codec->config.frame_drop_ratio;
 
 	create.num_threads = codec->config.num_threads;
@@ -637,6 +661,11 @@
 		frame->vop_flags |= XVID_VOP_CHROMAOPT;
 	}
 
+	if (config->zones[i].cartoon_mode) {
+		frame->vop_flags |= XVID_VOP_CARTOON;
+		frame->motion |= XVID_ME_DETECT_STATIC_MOTION;
+	}
+
 	if ((profiles[config->profile].flags & PROFILE_BVOP) && config->use_bvop) {
 		frame->bframe_threshold = config->zones[i].bvop_threshold;
 	}
@@ -674,12 +703,6 @@
 		}
 	}
 
-	if ((profiles[codec->config.profile].flags & PROFILE_REDUCED) &&
-		codec->config.reduced_resolution) {
-		frame.vol_flags |= XVID_VOL_REDUCED_ENABLE;
-		frame.vop_flags |= XVID_VOP_REDUCED;	/* XXX: need auto decion mode */
-	}
-
 	if ((profiles[codec->config.profile].flags & PROFILE_QPEL) && codec->config.qpel) {
 		frame.vol_flags |= XVID_VOL_QUARTERPEL;
 		frame.motion |= XVID_ME_QUARTERPELREFINE16 | XVID_ME_QUARTERPELREFINE8;
@@ -693,7 +716,10 @@
 	if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)
 		frame.vol_flags |= XVID_VOL_INTERLACING;
 
-	if (codec->config.ar_mode == 0) { /* PAR */
+  /* dxn: force 1:1 picture aspect ration */
+  if ((profiles[codec->config.profile].flags & PROFILE_DXN)) {
+    frame.par = XVID_PAR_11_VGA;
+  } else if (codec->config.ar_mode == 0) { /* PAR */
 		if (codec->config.display_aspect_ratio != 5) {
 			frame.par = codec->config.display_aspect_ratio + 1;
 		} else {
@@ -724,17 +750,14 @@
 		frame.vop_flags |= XVID_VOP_TRELLISQUANT;
 	}
 
-	if (codec->config.motion_search > 4)
-		frame.vop_flags |= XVID_VOP_INTER4V;
+  if ((profiles[codec->config.profile].flags & PROFILE_4MV)) {
+	  if (codec->config.motion_search > 4)
+		  frame.vop_flags |= XVID_VOP_INTER4V;
+  }
 
 	if (codec->config.chromame)
 		frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;
 
-	if (codec->config.cartoon_mode) {
-		frame.vop_flags |= XVID_VOP_CARTOON;
-		frame.motion |= XVID_ME_DETECT_STATIC_MOTION;
-	}
-
 	if (codec->config.turbo)
  		frame.motion |= XVID_ME_FASTREFINE16 | XVID_ME_FASTREFINE8 | 
 						XVID_ME_SKIP_DELTASEARCH | XVID_ME_FAST_MODEINTERPOLATE | 
@@ -963,6 +986,7 @@
 	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 	init.cpu_flags = codec->config.cpu;
+  init.debug = codec->config.debug;
 	codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
 
 	memset(&create, 0, sizeof(create));