[Mplayer-cvslog] CVS: main/liba52 downmix.c,1.11,1.12 a52_internal.h,1.1,1.2

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/liba52
In directory mplayer:/var/tmp.root/cvs-serv28560

Modified Files:
	downmix.c a52_internal.h 
Log Message:
runtime cpudetect


Index: downmix.c
===================================================================
RCS file: /cvsroot/mplayer/main/liba52/downmix.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- downmix.c	25 Dec 2001 17:45:25 -0000	1.11
+++ downmix.c	30 Dec 2001 19:57:14 -0000	1.12
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "../cpudetect.h"
 
 #include <string.h>
 #include <inttypes.h>
@@ -33,6 +34,20 @@
 
 #define CONVERT(acmod,output) (((output) << 3) + (acmod))
 
[...1031 lines suppressed...]
+	zero_MMX (samples + 1024);
 	break;
 
     case CONVERT (A52_3F2R, A52_2F1R):
-	zero (samples + 1024);
+	zero_MMX (samples + 1024);
     case CONVERT (A52_3F1R, A52_2F1R):
-    mix_31to21:
+    mix_31to21_MMX:
 	memcpy (samples + 768, samples + 512, 256 * sizeof (sample_t));
-	goto mix_3to2;
+	goto mix_3to2_MMX;
 
     case CONVERT (A52_3F2R, A52_2F2R):
 	memcpy (samples + 1024, samples + 768, 256 * sizeof (sample_t));
-	goto mix_31to21;
+	goto mix_31to21_MMX;
     }
 }
+#endif //ARCH_X86

Index: a52_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/liba52/a52_internal.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- a52_internal.h	9 Dec 2001 15:28:44 -0000	1.1
+++ a52_internal.h	30 Dec 2001 19:57:14 -0000	1.2
@@ -45,9 +45,9 @@
 		  sample_t clev, sample_t slev);
 int downmix_coeff (sample_t * coeff, int acmod, int output, sample_t level,
 		   sample_t clev, sample_t slev);
-void downmix (sample_t * samples, int acmod, int output, sample_t bias,
+extern void (*downmix) (sample_t * samples, int acmod, int output, sample_t bias,
 	      sample_t clev, sample_t slev);
-void upmix (sample_t * samples, int acmod, int output);
+extern void (*upmix) (sample_t * samples, int acmod, int output);
 
 void imdct_init (uint32_t mm_accel);
 extern void (* imdct_256) (sample_t * data, sample_t * delay, sample_t bias);