- sync with mpeg2dec 0.2.1

- small changes to frame freeing logic

CVS patchset: 1655
CVS date: 2002/04/01 13:18:21

1 files changed, 67 insertions, 65 deletions

diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c
index 9ea10c532..446766eae 100644
--- a/src/libmpeg2/motion_comp.c
+++ b/src/libmpeg2/motion_comp.c
@@ -1,8 +1,10 @@
 /*
  * motion_comp.c
- * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+ * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
+ * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
+ * See http://libmpeg2.sourceforge.net/ for updates.
  *
  * mpeg2dec is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,102 +27,102 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include "mm_accel.h"
 
-mc_functions_t mc_functions;
+mpeg2_mc_t mpeg2_mc;
 
-void motion_comp_init (void)
+void mpeg2_mc_init (uint32_t mm_accel)
 {
-
 #ifdef ARCH_X86
-    if (config.flags & MM_ACCEL_X86_MMXEXT) {
+    if (mm_accel & MM_ACCEL_X86_MMXEXT) {
 	fprintf (stderr, "Using MMXEXT for motion compensation\n");
-	mc_functions = mc_functions_mmxext;
-    } else if (config.flags & MM_ACCEL_X86_3DNOW) {
+	mpeg2_mc = mpeg2_mc_mmxext;
+    } else if (mm_accel & MM_ACCEL_X86_3DNOW) {
 	fprintf (stderr, "Using 3DNOW for motion compensation\n");
-	mc_functions = mc_functions_3dnow;
-    } else if (config.flags & MM_ACCEL_X86_MMX) {
+	mpeg2_mc = mpeg2_mc_3dnow;
+    } else if (mm_accel & MM_ACCEL_X86_MMX) {
 	fprintf (stderr, "Using MMX for motion compensation\n");
-	mc_functions = mc_functions_mmx;
+	mpeg2_mc = mpeg2_mc_mmx;
     } else
 #endif
-#ifdef LIBMPEG2_MLIB
-    if (config.flags & MM_ACCEL_MLIB) {
-	fprintf (stderr, "Using mlib for motion compensation\n");
-	mc_functions = mc_functions_mlib;
+#ifdef ARCH_PPC
+    if (mm_accel & MM_ACCEL_PPC_ALTIVEC) {
+	fprintf (stderr, "Using altivec for motion compensation\n");
+	mpeg2_mc = mpeg2_mc_altivec;
     } else
 #endif
-#ifdef ENABLE_ALTIVEC
-    if (config.flags & MM_ACCEL_PPC_ALTIVEC) {
-	fprintf (stderr, "Using altivec for motion compensation\n");
-	mc_functions = mc_functions_altivec;
+#ifdef LIBMPEG2_MLIB
+    if (mm_accel & MM_ACCEL_MLIB) {
+	fprintf (stderr, "Using mlib for motion compensation\n");
+	mpeg2_mc = mpeg2_mc_mlib;
     } else
 #endif
     {
 	fprintf (stderr, "No accelerated motion compensation found\n");
-	mc_functions = mc_functions_c;
+	mpeg2_mc = mpeg2_mc_c;
     }
 }
 
 #define avg2(a,b) ((a+b+1)>>1)
 #define avg4(a,b,c,d) ((a+b+c+d+2)>>2)
 
-#define predict_(i) (ref[i])
+#define predict_o(i) (ref[i])
 #define predict_x(i) (avg2 (ref[i], ref[i+1]))
 #define predict_y(i) (avg2 (ref[i], (ref+stride)[i]))
-#define predict_xy(i) (avg4 (ref[i], ref[i+1], (ref+stride)[i], (ref+stride)[i+1]))
+#define predict_xy(i) (avg4 (ref[i], ref[i+1], \
+			     (ref+stride)[i], (ref+stride)[i+1]))
 
 #define put(predictor,i) dest[i] = predictor (i)
 #define avg(predictor,i) dest[i] = avg2 (predictor (i), dest[i])
 
 /* mc function template */
 
-#define MC_FUNC(op,xy)						\
-static void MC_##op##_##xy##16_c (uint8_t * dest, uint8_t * ref,\
-				 int stride, int height)	\
-{								\
-    do {							\
-	op (predict_##xy, 0);					\
-	op (predict_##xy, 1);					\
-	op (predict_##xy, 2);					\
-	op (predict_##xy, 3);					\
-	op (predict_##xy, 4);					\
-	op (predict_##xy, 5);					\
-	op (predict_##xy, 6);					\
-	op (predict_##xy, 7);					\
-	op (predict_##xy, 8);					\
-	op (predict_##xy, 9);					\
-	op (predict_##xy, 10);					\
-	op (predict_##xy, 11);					\
-	op (predict_##xy, 12);					\
-	op (predict_##xy, 13);					\
-	op (predict_##xy, 14);					\
-	op (predict_##xy, 15);					\
-	ref += stride;						\
-	dest += stride;						\
-    } while (--height);						\
-}								\
-static void MC_##op##_##xy##8_c (uint8_t * dest, uint8_t * ref,	\
-				int stride, int height)		\
-{								\
-    do {							\
-	op (predict_##xy, 0);					\
-	op (predict_##xy, 1);					\
-	op (predict_##xy, 2);					\
-	op (predict_##xy, 3);					\
-	op (predict_##xy, 4);					\
-	op (predict_##xy, 5);					\
-	op (predict_##xy, 6);					\
-	op (predict_##xy, 7);					\
-	ref += stride;						\
-	dest += stride;						\
-    } while (--height);						\
+#define MC_FUNC(op,xy)							\
+static void MC_##op##_##xy##_16_c (uint8_t * dest, uint8_t * ref,	\
+				 int stride, int height)		\
+{									\
+    do {								\
+	op (predict_##xy, 0);						\
+	op (predict_##xy, 1);						\
+	op (predict_##xy, 2);						\
+	op (predict_##xy, 3);						\
+	op (predict_##xy, 4);						\
+	op (predict_##xy, 5);						\
+	op (predict_##xy, 6);						\
+	op (predict_##xy, 7);						\
+	op (predict_##xy, 8);						\
+	op (predict_##xy, 9);						\
+	op (predict_##xy, 10);						\
+	op (predict_##xy, 11);						\
+	op (predict_##xy, 12);						\
+	op (predict_##xy, 13);						\
+	op (predict_##xy, 14);						\
+	op (predict_##xy, 15);						\
+	ref += stride;							\
+	dest += stride;							\
+    } while (--height);							\
+}									\
+static void MC_##op##_##xy##_8_c (uint8_t * dest, uint8_t * ref,	\
+				int stride, int height)			\
+{									\
+    do {								\
+	op (predict_##xy, 0);						\
+	op (predict_##xy, 1);						\
+	op (predict_##xy, 2);						\
+	op (predict_##xy, 3);						\
+	op (predict_##xy, 4);						\
+	op (predict_##xy, 5);						\
+	op (predict_##xy, 6);						\
+	op (predict_##xy, 7);						\
+	ref += stride;							\
+	dest += stride;							\
+    } while (--height);							\
 }
 
 /* definitions of the actual mc functions */
 
-MC_FUNC (put,)
-MC_FUNC (avg,)
+MC_FUNC (put,o)
+MC_FUNC (avg,o)
 MC_FUNC (put,x)
 MC_FUNC (avg,x)
 MC_FUNC (put,y)
@@ -128,4 +130,4 @@ MC_FUNC (avg,y)
 MC_FUNC (put,xy)
 MC_FUNC (avg,xy)
 
-MOTION_COMP_EXTERN (c)
+MPEG2_MC_EXTERN (c)