[MPlayer-cvslog] CVS: main/libmpcodecs pullup.c, 1.28, 1.29 vf_decimate.c, 1.4, 1.5 vf_divtc.c, 1.5, 1.6 vf_eq.c, 1.11, 1.12 vf_eq2.c, 1.11, 1.12 vf_fspp.c, 1.14, 1.15 vf_halfpack.c, 1.9, 1.10 vf_ilpack.c, 1.7, 1.8 vf_ivtc.c, 1.7, 1.8 vf_noise.c, 1.18, 1.19

Nicolas Plourde CVS syncmail at mplayerhq.hu
Sat Apr 15 22:46:56 CEST 2006


CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv17711/libmpcodecs

Modified Files:
	pullup.c vf_decimate.c vf_divtc.c vf_eq.c vf_eq2.c vf_fspp.c 
	vf_halfpack.c vf_ilpack.c vf_ivtc.c vf_noise.c 
Log Message:
add support for intel mac. mp3lib is not fixed yet.

Index: pullup.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/pullup.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pullup.c	9 Feb 2006 14:07:55 -0000	1.28
+++ pullup.c	15 Apr 2006 20:46:54 -0000	1.29
@@ -5,6 +5,7 @@
 #include <string.h>
 #include "pullup.h"
 #include "config.h"
+#include "asmalign.h"
 
 
 
@@ -18,7 +19,7 @@
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%esi), %%mm0 \n\t"
@@ -67,7 +68,7 @@
 		"pxor %%mm7, %%mm7 \n\t"
 		"subl %%eax, %%edi \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"2: \n\t"
 
 		"movq (%%esi), %%mm0 \n\t"
@@ -156,7 +157,7 @@
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%esi), %%mm0 \n\t"

Index: vf_decimate.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_decimate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_decimate.c	21 Mar 2006 21:26:41 -0000	1.4
+++ vf_decimate.c	15 Apr 2006 20:46:54 -0000	1.5
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -28,7 +29,7 @@
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"1: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"

Index: vf_divtc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_divtc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_divtc.c	21 Mar 2006 21:26:41 -0000	1.5
+++ vf_divtc.c	15 Apr 2006 20:46:54 -0000	1.6
@@ -8,6 +8,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 #include "bswap.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -41,7 +42,7 @@
 	"pxor %%mm4, %%mm4 \n\t"
 	"pxor %%mm7, %%mm7 \n\t"
 
-	".balign 16 \n\t"
+	ASMALIGN16
 	"1: \n\t"
 
 	"movq (%%"REG_S"), %%mm0 \n\t"

Index: vf_eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_eq.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vf_eq.c	21 Mar 2006 21:26:41 -0000	1.11
+++ vf_eq.c	15 Apr 2006 20:46:54 -0000	1.12
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -51,7 +52,7 @@
 			"movq (%6), %%mm4 \n\t"
 			"pxor %%mm0, %%mm0 \n\t"
 			"movl %4, %%eax\n\t"
-                       ".balign 16 \n\t"
+                       ASMALIGN16
 			"1: \n\t"
 			"movq (%0), %%mm1 \n\t"
 			"movq (%0), %%mm2 \n\t"

Index: vf_eq2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_eq2.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vf_eq2.c	21 Mar 2006 21:26:41 -0000	1.11
+++ vf_eq2.c	15 Apr 2006 20:46:54 -0000	1.12
@@ -18,6 +18,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -135,7 +136,7 @@
       "movq (%6), %%mm4 \n\t"
       "pxor %%mm0, %%mm0 \n\t"
       "movl %4, %%eax\n\t"
-      ".balign 16 \n\t"
+      ASMALIGN16
       "1: \n\t"
       "movq (%0), %%mm1 \n\t"
       "movq (%0), %%mm2 \n\t"

Index: vf_fspp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fspp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vf_fspp.c	21 Mar 2006 21:26:41 -0000	1.14
+++ vf_fspp.c	15 Apr 2006 20:46:54 -0000	1.15
@@ -37,6 +37,7 @@
 #include <math.h>
 
 #include "config.h"
+#include "asmalign.h"
 
 #include "mp_msg.h"
 #include "cpudetect.h"
@@ -888,7 +889,7 @@
 static void column_fidct_mmx(int16_t* thr_adr,  DCTELEM *data,  DCTELEM *output,  int cnt)
 {
     asm volatile(
-	".align 16                   \n\t"
+	ASMALIGN16
 	"1:                   \n\t"
 	"movq "DCTSIZE_S"*0*2(%%"REG_S"), %%mm1 \n\t"
 	//

Index: vf_halfpack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_halfpack.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_halfpack.c	21 Mar 2006 21:26:41 -0000	1.9
+++ vf_halfpack.c	15 Apr 2006 20:46:54 -0000	1.10
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -40,7 +41,7 @@
 	for (h/=2; h; h--) {
 		asm (
 			"pxor %%mm0, %%mm0 \n\t"
-			".balign 16 \n\t"
+			ASMALIGN16
 			"1: \n\t"
 			"movq (%0), %%mm1 \n\t"
 			"movq (%0), %%mm2 \n\t"

Index: vf_ilpack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_ilpack.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_ilpack.c	21 Mar 2006 21:26:41 -0000	1.7
+++ vf_ilpack.c	15 Apr 2006 20:46:54 -0000	1.8
@@ -6,6 +6,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -66,7 +67,7 @@
 {
 	int j;
 	asm volatile (""
-		".balign 16 \n\t"
+		ASMALIGN16                
 		"1: \n\t"
 		"movq (%0), %%mm1 \n\t"
 		"movq (%0), %%mm2 \n\t"
@@ -105,7 +106,7 @@
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16 
 		".Lli0: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
@@ -213,7 +214,7 @@
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		".Lli1: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"

Index: vf_ivtc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_ivtc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_ivtc.c	21 Mar 2006 21:26:41 -0000	1.7
+++ vf_ivtc.c	15 Apr 2006 20:46:54 -0000	1.8
@@ -5,6 +5,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #include "img_format.h"
 #include "mp_image.h"
@@ -67,7 +68,7 @@
 		"pxor %%mm5, %%mm5 \n\t" // 4 odd difference sums
 		"pxor %%mm7, %%mm7 \n\t" // all zeros
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		"1: \n\t"
 		
 		// Even difference
@@ -127,7 +128,7 @@
 		"pxor %%mm5, %%mm5 \n\t" // Temporal noise
 		"pxor %%mm6, %%mm6 \n\t" // Current spacial noise
 		
-		".balign 16 \n\t"
+		ASMALIGN16  
 		"2: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"
@@ -181,7 +182,7 @@
 		"pxor %%mm5, %%mm5 \n\t"
 		"pxor %%mm6, %%mm6 \n\t"
 		
-		".balign 16 \n\t"
+		ASMALIGN16
 		"3: \n\t"
 		
 		"movq (%%"REG_S"), %%mm0 \n\t"

Index: vf_noise.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_noise.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vf_noise.c	3 Apr 2006 06:25:30 -0000	1.18
+++ vf_noise.c	15 Apr 2006 20:46:54 -0000	1.19
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "cpudetect.h"
+#include "asmalign.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -153,7 +154,7 @@
 		"pcmpeqb %%mm7, %%mm7		\n\t"
 		"psllw $15, %%mm7		\n\t"
 		"packsswb %%mm7, %%mm7		\n\t"
-		".balign 16			\n\t"
+		ASMALIGN16   
 		"1:				\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
@@ -182,7 +183,7 @@
 		"pcmpeqb %%mm7, %%mm7		\n\t"
 		"psllw $15, %%mm7		\n\t"
 		"packsswb %%mm7, %%mm7		\n\t"
-		".balign 16			\n\t"
+		ASMALIGN16  
 		"1:				\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
@@ -220,7 +221,7 @@
 
 	asm volatile(
 		"mov %5, %%"REG_a"		\n\t"
-		".balign 16			\n\t"
+		ASMALIGN16   
 		"1:				\n\t"
 		"movq (%1, %%"REG_a"), %%mm1	\n\t"
 		"movq (%0, %%"REG_a"), %%mm0	\n\t"




More information about the MPlayer-cvslog mailing list