--- branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/06/25 23:23:21	1073
+++ branches/dev-api-4/xvidcore/examples/xvid_encraw.c	2003/08/10 13:10:09	1121
@@ -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: xvid_encraw.c,v 1.11.2.28 2003-06-25 23:23:21 edgomez Exp $
+ * $Id: xvid_encraw.c,v 1.11.2.35 2003-08-10 13:10:09 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -55,7 +55,8 @@
 /*****************************************************************************
  *                            Quality presets
  ****************************************************************************/
-static xvid_motion_t const motion_presets[] = {
+
+static const int motion_presets[] = {
 	/* quality 0 */
 	0,
 
@@ -72,22 +73,22 @@
 	/* quality 4 */
 	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 	/* quality 5 */
 	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 	/* quality 6 */
 	XVID_ME_ADVANCEDDIAMOND16 | XVID_ME_HALFPELREFINE16 | XVID_ME_EXTSEARCH16 |
 	XVID_ME_ADVANCEDDIAMOND8 | XVID_ME_HALFPELREFINE8 | XVID_ME_EXTSEARCH8 |
-	XVID_ME_CHROMA16 | XVID_ME_CHROMA8 ,
+	XVID_ME_CHROMA_PVOP | XVID_ME_CHROMA_BVOP,
 
 };
 #define ME_ELEMENTS (sizeof(motion_presets)/sizeof(motion_presets[0]))
 
-static xvid_vop_t const vop_presets[] = {
+static const int vop_presets[] = {
 	/* quality 0 */
 	0,
 
@@ -149,6 +150,8 @@
 static int ARG_PACKED = 0;
 static int ARG_DEBUG = 0;
 static int ARG_VOPDEBUG = 0;
+static int ARG_GMC = 0;
+static int ARG_QPEL = 0;
 
 #ifndef READ_PNM
 #define IMAGE_SIZE(x,y) ((x)*(y)*3/2)
@@ -336,6 +339,10 @@
 			ARG_OUTPUTFILE = argv[i];
 		} else if (strcmp("-vop_debug", argv[i]) == 0) {
 			ARG_VOPDEBUG = 1;
+		} else if (strcmp("-qpel", argv[i]) == 0) {
+			ARG_QPEL = 1;
+		} else if (strcmp("-gmc", argv[i]) == 0) {
+			ARG_GMC = 1;
 		} else if (strcmp("-help", argv[i])) {
 			usage();
 			return (0);
@@ -681,6 +688,8 @@
 	fprintf(stderr, "Other options\n");
 	fprintf(stderr, " -asm            : use assembly optmized code\n");
 	fprintf(stderr, " -quality integer: quality ([0..%d])\n", ME_ELEMENTS - 1);
+	fprintf(stderr, " -qpel           : use quarter pixel ME\n");
+	fprintf(stderr, " -gmc            : use global motion compensation\n");
 	fprintf(stderr, " -packed         : packed mode\n");
 	fprintf(stderr, " -lumimasking    : use lumimasking algorithm\n");
 	fprintf(stderr, " -stats          : print stats about encoded frames\n");
@@ -887,7 +896,7 @@
 	if (use_assembler) {
 
 #ifdef ARCH_IS_IA64
-		xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_IA64;
+		xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ASM;
 #else
 		xvid_gbl_init.cpu_flags = 0;
 #endif
@@ -1067,9 +1076,16 @@
 	xvid_enc_frame.vol_flags = 0;
 	if (ARG_STATS)
 		xvid_enc_frame.vol_flags |= XVID_VOL_EXTRASTATS;
+	if (ARG_QPEL)
+		xvid_enc_frame.vol_flags |= XVID_VOL_QUARTERPEL;
+	if (ARG_GMC)
+		xvid_enc_frame.vol_flags |= XVID_VOL_GMC;
 
 	/* Set up core's general features */
 	xvid_enc_frame.vop_flags = vop_presets[ARG_QUALITY];
+	if (ARG_GMC)
+		xvid_enc_frame.vop_flags |= XVID_ME_GME_REFINE;
+
     if (ARG_VOPDEBUG) {
         xvid_enc_frame.vop_flags |= XVID_VOP_DEBUG;
     }
@@ -1083,14 +1099,18 @@
 	/* Set up motion estimation flags */
 	xvid_enc_frame.motion = motion_presets[ARG_QUALITY];
 
+	if (ARG_QPEL)
+		xvid_enc_frame.motion |= XVID_ME_QUARTERPELREFINE16;
+	if (ARG_QPEL && (xvid_enc_frame.vop_flags & XVID_VOP_INTER4V))
+		xvid_enc_frame.motion |= XVID_ME_QUARTERPELREFINE8;
+
 	/* We don't use special matrices */
 	xvid_enc_frame.quant_intra_matrix = NULL;
 	xvid_enc_frame.quant_inter_matrix = NULL;
 
 	/* Encode the frame */
-	ret =
-		xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame,
-					&xvid_enc_stats);
+	ret = xvid_encore(enc_handle, XVID_ENC_ENCODE, &xvid_enc_frame,
+					  &xvid_enc_stats);
 
 	*key = (xvid_enc_frame.out_flags & XVID_KEYFRAME);
 	*stats_type = xvid_enc_stats.type;