[MPlayer-cvslog] r26078 - in trunk/libmpeg2: libmpeg-0.4.1.diff motion_comp.c mpeg2.h

[diego]

Author: diego
Date: Sat Feb 23 20:29:28 2008
New Revision: 26078

Log:
Properly detect ARM mc acceleration.


Modified:
   trunk/libmpeg2/libmpeg-0.4.1.diff
   trunk/libmpeg2/motion_comp.c
   trunk/libmpeg2/mpeg2.h

Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff	Sat Feb 23 20:29:28 2008
@@ -258,9 +258,9 @@
      else
  #endif
 +#ifdef ARCH_ARM
-+    if (1 /*accel & MPEG2_ACCEL_ARM*/) {
++    if (accel & MPEG2_ACCEL_ARM) {
 +#ifdef HAVE_IWMMXT
-+	if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
++	if (accel & MPEG2_ACCEL_ARM_IWMMXT)
 +	    mpeg2_mc = mpeg2_mc_iwmmxt;
 +	else
 +#endif
@@ -291,14 +291,21 @@
  #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
  
  typedef struct mpeg2_picture_s {
-@@ -154,6 +159,7 @@
- #define MPEG2_ACCEL_X86_MMX 1
+@@ -156,12 +160,13 @@
  #define MPEG2_ACCEL_X86_3DNOW 2
  #define MPEG2_ACCEL_X86_MMXEXT 4
-+#define MPEG2_ACCEL_X86_SSE2 8
+ #define MPEG2_ACCEL_X86_SSE2 8
+-#define MPEG2_ACCEL_X86_SSE3 16
  #define MPEG2_ACCEL_PPC_ALTIVEC 1
  #define MPEG2_ACCEL_ALPHA 1
  #define MPEG2_ACCEL_ALPHA_MVI 2
+ #define MPEG2_ACCEL_SPARC_VIS 1
+ #define MPEG2_ACCEL_SPARC_VIS2 2
++#define MPEG2_ACCEL_ARM 1
++#define MPEG2_ACCEL_ARM_IWMMXT 2
+ #define MPEG2_ACCEL_DETECT 0x80000000
+ 
+ uint32_t mpeg2_accel (uint32_t accel);
 --- libmpeg2/mpeg2_internal.h	2006-06-16 20:12:26.000000000 +0200
 +++ libmpeg2/mpeg2_internal.h	2006-06-16 20:12:50.000000000 +0200
 @@ -144,6 +148,12 @@

Modified: trunk/libmpeg2/motion_comp.c
==============================================================================
--- trunk/libmpeg2/motion_comp.c	(original)
+++ trunk/libmpeg2/motion_comp.c	Sat Feb 23 20:29:28 2008
@@ -68,9 +68,9 @@ void mpeg2_mc_init (uint32_t accel)
     else
 #endif
 #ifdef ARCH_ARM
-    if (1 /*accel & MPEG2_ACCEL_ARM*/) {
+    if (accel & MPEG2_ACCEL_ARM) {
 #ifdef HAVE_IWMMXT
-	if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/)
+	if (accel & MPEG2_ACCEL_ARM_IWMMXT)
 	    mpeg2_mc = mpeg2_mc_iwmmxt;
 	else
 #endif

Modified: trunk/libmpeg2/mpeg2.h
==============================================================================
--- trunk/libmpeg2/mpeg2.h	(original)
+++ trunk/libmpeg2/mpeg2.h	Sat Feb 23 20:29:28 2008
@@ -165,6 +165,8 @@ void mpeg2_custom_fbuf (mpeg2dec_t * mpe
 #define MPEG2_ACCEL_ALPHA_MVI 2
 #define MPEG2_ACCEL_SPARC_VIS 1
 #define MPEG2_ACCEL_SPARC_VIS2 2
+#define MPEG2_ACCEL_ARM 1
+#define MPEG2_ACCEL_ARM_IWMMXT 2
 #define MPEG2_ACCEL_DETECT 0x80000000
 
 uint32_t mpeg2_accel (uint32_t accel);