* Have dvdread plug-in respond to dvd: URLs ;

* MacOS X interface shouldn't take as much CPU as it used to ;
* Fixed a bug in Altivec-enabled MC (thanks walken) ;
* Fixed a case of segfault in Altivec-enabled memcpy.

plugins/dvdread/dvdread.c

@@ -2,7 +2,7 @@
  * dvdread.c : DvdRead input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dvdread.c,v 1.13 2002/03/06 16:39:37 stef Exp $
+ * $Id: dvdread.c,v 1.14 2002/04/16 23:00:54 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -47,6 +47,7 @@ MODULE_INIT_START
     ADD_CAPABILITY( DEMUX, 0 )
     ADD_CAPABILITY( ACCESS, 110 )
     ADD_SHORTCUT( "dvdread" )
+    ADD_SHORTCUT( "dvd" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START

plugins/macosx/intf_controller.c

@@ -2,7 +2,7 @@
  * intf_controller.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.c,v 1.4 2002/03/19 03:33:52 jlj Exp $
+ * $Id: intf_controller.c,v 1.5 2002/04/16 23:00:54 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -91,7 +91,7 @@
             UpdateSystemActivity( UsrActivity );
         }
 
-        sleepDate = [NSDate dateWithTimeIntervalSinceNow: 0.1];
+        sleepDate = [NSDate dateWithTimeIntervalSinceNow: 0.5];
         [NSThread sleepUntilDate: sleepDate];
     }
 

plugins/macosx/intf_macosx.c

@@ -2,7 +2,7 @@
  * intf_macosx.c: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_macosx.c,v 1.11 2002/02/18 01:34:44 jlj Exp $
+ * $Id: intf_macosx.c,v 1.12 2002/04/16 23:00:54 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>

plugins/memcpy/memcpyaltivec.c

@@ -2,7 +2,7 @@
  * memcpyaltivec.c : Altivec memcpy module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: memcpyaltivec.c,v 1.3 2002/04/07 23:08:44 massiot Exp $
+ * $Id: memcpyaltivec.c,v 1.4 2002/04/16 23:00:54 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -122,7 +122,7 @@ void * _M( fast_memcpy )(void * _to, const void * _from, size_t len)
             from += 16;
             len -= 16;
             tmp = vec_perm( ref0, ref1, perm );
-            do
+            while( len & ~(MMREG_SIZE-1) )
             {
                 ref0 = vec_ld( 0, from );
                 ref1 = vec_ld( 15, from );
@@ -131,7 +131,7 @@ void * _M( fast_memcpy )(void * _to, const void * _from, size_t len)
                 vec_st( tmp, 0, to );
                 tmp = vec_perm( ref0, ref1, perm );
                 to += 16;
-            } while( len & ~(MMREG_SIZE-1) );
+            }
             vec_st( tmp, 0, to );
             to += 16;
         }
@@ -185,14 +185,16 @@ void * _M( fast_memcpy )(void * _to, const void * _from, size_t len)
 	"	._L4:					\n"
 	"	rlwinm.		%r0,  %r5,  0,	  0,	27    \n"
 	"	bc		12,   2,    ._L3	\n"
+	"	addi		%r5,  %r5,  -16		\n"
 	"	li		%r11, 15		\n"
 	"	lvsl		%v12, 0,    %r4		\n"
 	"	lvx		%v1,  0,    %r4		\n"
 	"	lvx		%v0,  %r11, %r4		\n"
-        "       addi            %r4,  %r4,  16          \n"
+	"	rlwinm.		%r0,  %r5,  0,	  0,	27    \n"
 	"	vperm		%v13, %v1,  %v0,  %v12	\n"
-        "       addi            %r5,  %r5,  -16         \n"
-        "       ._L13:                                  \n"
+	"	addi		%r4,  %r4,  16		\n"
+	"	bc		12,   2,    ._L11	\n"
+	"	._L12:					\n"
 	"	addi		%r5,  %r5,  -16		\n"
 	"	li		%r11, 15		\n"
 	"	lvx		%v1,  0,    %r4		\n"
@@ -202,7 +204,8 @@ void * _M( fast_memcpy )(void * _to, const void * _from, size_t len)
 	"	vperm		%v13, %v1,  %v0,  %v12	\n"
 	"	addi		%r4,  %r4,  16		\n"
 	"	addi		%r9,  %r9,  16		\n"
-        "       bc              4,    2,    ._L13       \n"
+	"	bc		4,    2,    ._L12	\n"
+	"	._L11:					\n"
 	"	stvx		%v13, 0,    %r9		\n"
 	"	addi		%r9,  %r9,  16		\n"
 	"	._L3:					\n"
@@ -218,7 +221,6 @@ void * _M( fast_memcpy )(void * _to, const void * _from, size_t len)
 	"	cmplw		%cr0, %r9,  %r5		\n"
 	"	addi		%r4,  %r4,  1		\n"
 	"	bc		12,   0,    ._L17	\n"
-        "       blr                                     \n"
         );
 }
 

plugins/motion/motionaltivec.c

@@ -2,7 +2,7 @@
  * motionaltivec.c : Altivec motion compensation module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: motionaltivec.c,v 1.10 2002/02/15 13:32:53 sam Exp $
+ * $Id: motionaltivec.c,v 1.11 2002/04/16 23:00:54 massiot Exp $
  *
  * Authors: Michel Lespinasse <walken@zoy.org>
  *          Paul Mackerras <paulus@linuxcare.com.au>
@@ -466,7 +466,7 @@ static void MC_put_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	vspltisb	%v3,  1			\n"
 	"	lvsl		%v5,  %r5,  %r4		\n"
 	"	vmrghb		%v4,  %v4,  %v4		\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	vmrghb		%v5,  %v5,  %v5		\n"
 	"	lvx		%v1,  0,    %r4		\n"
 	"	vpkuhum		%v4,  %v4,  %v4		\n"
@@ -495,8 +495,8 @@ static void MC_put_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	vavgub		%v1,  %v9,  %v7		\n"
 	"	vand		%v0,  %v0,  %v13	\n"
 	"	vsububm		%v13, %v1,  %v0		\n"
-	"._L41:						\n"
-	"	li		%r9,  16		\n"
+	"	._L41:					\n"
+	"	li		%r9,  8			\n"
 	"	lvx		%v0,  %r9,  %r4		\n"
 	"	lvx		%v1,  0,    %r4		\n"
 	"	stvewx		%v13, 0,    %r3		\n"
@@ -505,7 +505,7 @@ static void MC_put_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	stvewx		%v13, %r9,  %r3		\n"
 	"	vperm		%v11, %v1,  %v0,  %v4	\n"
 	"	add		%r4,  %r4,  %r5		\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	vavgub		%v9,  %v11, %v10	\n"
 	"	lvx		%v0,  %r9,  %r4		\n"
 	"	vxor		%v8,  %v11, %v10	\n"
@@ -533,7 +533,7 @@ static void MC_put_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	add		%r3,  %r3,  %r5		\n"
 	"	vsububm		%v13, %v0,  %v1		\n"
 	"	bdnz		._L41			\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	lvx		%v0,  %r9,  %r4		\n"
 	"	lvx		%v1,  0,    %r4		\n"
 	"	stvewx		%v13, 0,    %r3		\n"
@@ -1000,7 +1000,7 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	vspltisb	%v19, 1			\n"
 	"	lvsl		%v3,  %r5,  %r4		\n"
 	"	vmrghb		%v2,  %v2,  %v2		\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	vmrghb		%v3,  %v3,  %v3		\n"
 	"	lvx		%v9,  0,    %r4		\n"
 	"	vpkuhum		%v2,  %v2,  %v2		\n"
@@ -1031,8 +1031,8 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	vand		%v1,  %v1,  %v13	\n"
 	"	vsububm		%v0,  %v0,  %v1		\n"
 	"	vavgub		%v13, %v4,  %v0		\n"
-	"._L81:						\n"
-	"	li		%r9,  16		\n"
+	"	._L81:					\n"
+	"	li		%r9,  8			\n"
 	"	lvx		%v1,  %r9,  %r4		\n"
 	"	lvx		%v9,  0,    %r4		\n"
 	"	lvx		%v4,  %r5,  %r3		\n"
@@ -1043,7 +1043,7 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	stvewx		%v13, %r9,  %r3		\n"
 	"	vxor		%v7,  %v11, %v10	\n"
 	"	add		%r4,  %r4,  %r5		\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	vavgub		%v8,  %v11, %v10	\n"
 	"	lvx		%v1,  %r9,  %r4		\n"
 	"	vor		%v0,  %v7,  %v5		\n"
@@ -1073,7 +1073,7 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref,
 	"	add		%r3,  %r3,  %r5		\n"
 	"	vavgub		%v13, %v4,  %v0		\n"
 	"	bdnz		._L81			\n"
-	"	li		%r9,  16		\n"
+	"	li		%r9,  8			\n"
 	"	lvx		%v1,  %r9,  %r4		\n"
 	"	lvx		%v9,  0,    %r4		\n"
 	"	lvx		%v4,  %r5,  %r3		\n"
@@ -1417,7 +1417,6 @@ void MC_put_xy_16_altivec (unsigned char * dest, unsigned char * ref,
                    vec_and (vec_and (ones, vec_or (xor0, xor1)),
                             vec_xor (avg0, avg1)));
 
-
     do {
         ref0 = vec_ld (0, ref);
         ref1 = vec_ld (16, ref);
@@ -1477,7 +1476,7 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     height = (height >> 1) - 1;
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     ref += stride;
     A = vec_perm (ref0, ref1, perm0A);
     B = vec_perm (ref0, ref1, perm0B);
@@ -1485,7 +1484,7 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     xor0 = vec_xor (A, B);
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     ref += stride;
     A = vec_perm (ref0, ref1, perm1A);
     B = vec_perm (ref0, ref1, perm1B);
@@ -1495,10 +1494,9 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
                    vec_and (vec_and (ones, vec_or (xor0, xor1)),
                             vec_xor (avg0, avg1)));
 
-
     do {
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         ref += stride;
         vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
         vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest);
@@ -1512,7 +1510,7 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
                                 vec_xor (avg0, avg1)));
 
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         ref += stride;
         vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
         vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest);
@@ -1527,7 +1525,7 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     } while (--height);
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
     vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest);
     dest += stride;
@@ -1558,12 +1556,12 @@ void MC_put_xy_8_altivec (unsigned char * dest, unsigned char * ref,
 
     do {
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         ref += stride;
         A = vec_perm (ref0, ref1, permA);
         B = vec_perm (ref0, ref1, permB);
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         C = vec_perm (ref0, ref1, permA);
         D = vec_perm (ref0, ref1, permB);
 
@@ -1916,7 +1914,6 @@ void MC_avg_xy_16_altivec (unsigned char * dest, unsigned char * ref,
                                   vec_and (vec_and (ones, vec_or (xor0, xor1)),
                                            vec_xor (avg0, avg1))));
 
-
     do {
         ref0 = vec_ld (0, ref);
         ref1 = vec_ld (16, ref);
@@ -1981,7 +1978,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     height = (height >> 1) - 1;
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     ref += stride;
     A = vec_perm (ref0, ref1, perm0A);
     B = vec_perm (ref0, ref1, perm0B);
@@ -1989,7 +1986,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     xor0 = vec_xor (A, B);
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     ref += stride;
     prev = vec_ld (0, dest);
     A = vec_perm (ref0, ref1, perm1A);
@@ -2000,10 +1997,9 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
                                   vec_and (vec_and (ones, vec_or (xor0, xor1)),
                                            vec_xor (avg0, avg1))));
 
-
     do {
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         ref += stride;
         prev = vec_ld (stride, dest);
         vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
@@ -2019,7 +2015,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
                                          vec_xor (avg0, avg1))));
 
         ref0 = vec_ld (0, ref);
-        ref1 = vec_ld (16, ref);
+        ref1 = vec_ld (8, ref);
         ref += stride;
         prev = vec_ld (stride, dest);
         vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
@@ -2036,7 +2032,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
     } while (--height);
 
     ref0 = vec_ld (0, ref);
-    ref1 = vec_ld (16, ref);
+    ref1 = vec_ld (8, ref);
     prev = vec_ld (stride, dest);
     vec_ste ((vector_u32_t)tmp, 0, (unsigned int *)dest);
     vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest);