14669
|
1 |
diff -ru libvisual-0.4.0.orig/libvisual/lv_types.h libvisual-0.4.0/libvisual/lv_types.h
|
|
2 |
--- libvisual-0.4.0.orig/libvisual/lv_types.h Tue Feb 14 04:54:08 2006
|
|
3 |
+++ libvisual-0.4.0/libvisual/lv_types.h Tue Nov 25 14:15:26 2008
|
|
4 |
@@ -30,6 +30,11 @@
|
|
5 |
#include <stdint.h>
|
|
6 |
#else
|
|
7 |
#include <sys/types.h>
|
|
8 |
+
|
|
9 |
+#if defined(__sun__) || defined(__sun)
|
|
10 |
+#include <inttypes.h>
|
|
11 |
+#endif
|
|
12 |
+
|
|
13 |
#endif /* !VISUAL_OS_WIN32 */
|
|
14 |
|
|
15 |
VISUAL_BEGIN_DECLS
|
|
16 |
@@ -38,7 +43,7 @@
|
|
17 |
|
|
18 |
#define VISUAL_TABLESIZE(table) (sizeof (table) / sizeof (table[0]))
|
|
19 |
|
|
20 |
-#if !defined(VISUAL_OS_WIN32)
|
|
21 |
+#if !defined(VISUAL_OS_WIN32) && !defined(__sun__) && !defined(__sun)
|
|
22 |
#ifndef uint8_t
|
|
23 |
#define uint8_t u_int8_t
|
|
24 |
#endif
|
|
25 |
@@ -50,7 +55,7 @@
|
|
26 |
#ifndef uint32_t
|
|
27 |
#define uint32_t u_int32_t
|
|
28 |
#endif
|
|
29 |
-#endif /* !VISUAL_OS_WIN32 */
|
|
30 |
+#endif /* !VISUAL_OS_WIN32 && !__sun__ && !__sun */
|
|
31 |
|
|
32 |
VISUAL_END_DECLS
|
|
33 |
|
|
34 |
diff -ru libvisual-0.4.0.orig/libvisual/lv_video_simd.c libvisual-0.4.0/libvisual/lv_video_simd.c
|
|
35 |
--- libvisual-0.4.0.orig/libvisual/lv_video_simd.c Mon Feb 6 02:45:57 2006
|
|
36 |
+++ libvisual-0.4.0/libvisual/lv_video_simd.c Tue Nov 25 14:15:31 2008
|
|
37 |
@@ -140,60 +140,60 @@
|
|
38 |
* Adding colors together. (Thread #7)
|
|
39 |
*/
|
|
40 |
|
|
41 |
- "#1\n\t movd %[fracu], %%mm4" /* mm4 = [ 0 | 0 | 0x10 | fracU ] */
|
|
42 |
- "#2\n\t movd %[fracv], %%mm6" /* mm6 = [ 0 | 0 | 0x10 | fracV ] */
|
|
43 |
+ "# 1\n\t movd %[fracu], %%mm4" /* mm4 = [ 0 | 0 | 0x10 | fracU ] */
|
|
44 |
+ "# 2\n\t movd %[fracv], %%mm6" /* mm6 = [ 0 | 0 | 0x10 | fracV ] */
|
|
45 |
|
|
46 |
- "#1\n\t punpcklwd %%mm4, %%mm4" /* mm4 = [ 0x10 | 0x10 | fracU | fracU ] */
|
|
47 |
- "#2\n\t movq %%mm6, %%mm3"
|
|
48 |
+ "# 1\n\t punpcklwd %%mm4, %%mm4" /* mm4 = [ 0x10 | 0x10 | fracU | fracU ] */
|
|
49 |
+ "# 2\n\t movq %%mm6, %%mm3"
|
|
50 |
|
|
51 |
- "#1\n\t pxor %%mm5, %%mm5"
|
|
52 |
- "#2\n\t punpckldq %%mm6, %%mm6" /* mm6 = [ 0x10 | fracv | 0x10 | fracV ] */
|
|
53 |
- "#3\n\t movq %[pixel_u], %%mm0" /* mm0 = [ col[0] | col[2] ] */
|
|
54 |
+ "# 1\n\t pxor %%mm5, %%mm5"
|
|
55 |
+ "# 2\n\t punpckldq %%mm6, %%mm6" /* mm6 = [ 0x10 | fracv | 0x10 | fracV ] */
|
|
56 |
+ "# 3\n\t movq %[pixel_u], %%mm0" /* mm0 = [ col[0] | col[2] ] */
|
|
57 |
|
|
58 |
- "#1\n\t punpckldq %%mm4, %%mm5" /* mm5 = [ fracU | fracU | 0 | 0 ] */
|
|
59 |
- "#2\n\t punpcklwd %%mm7, %%mm3" /* mm3 = [ 0 | 0x10 | 0 | fracV ] */
|
|
60 |
- "#3\n\t movq %%mm0, %%mm2"
|
|
61 |
+ "# 1\n\t punpckldq %%mm4, %%mm5" /* mm5 = [ fracU | fracU | 0 | 0 ] */
|
|
62 |
+ "# 2\n\t punpcklwd %%mm7, %%mm3" /* mm3 = [ 0 | 0x10 | 0 | fracV ] */
|
|
63 |
+ "# 3\n\t movq %%mm0, %%mm2"
|
|
64 |
|
|
65 |
- "#1\n\t psubusw %%mm5, %%mm4" /* mm4 = [ 0x10-fracU | 0x10-fracU | fracU | fracU ] */
|
|
66 |
- "#2\n\t punpckldq %%mm3, %%mm3" /* mm3 = [ 0 | fracV | 0 | fracV ] */
|
|
67 |
- "#4\n\t movq %[pixel_l], %%mm1" /* mm1 = [ col[1] | col[3] ] */
|
|
68 |
+ "# 1\n\t psubusw %%mm5, %%mm4" /* mm4 = [ 0x10-fracU | 0x10-fracU | fracU | fracU ] */
|
|
69 |
+ "# 2\n\t punpckldq %%mm3, %%mm3" /* mm3 = [ 0 | fracV | 0 | fracV ] */
|
|
70 |
+ "# 4\n\t movq %[pixel_l], %%mm1" /* mm1 = [ col[1] | col[3] ] */
|
|
71 |
|
|
72 |
- "#2\n\t pslld $16, %%mm3" /* mm3 = [ fracV | 0 | fracV | 0 ] */
|
|
73 |
- "#3\n\t punpcklbw %%mm7, %%mm0" /* mm0 = [ col[0] unpacked ] */
|
|
74 |
+ "# 2\n\t pslld $16, %%mm3" /* mm3 = [ fracV | 0 | fracV | 0 ] */
|
|
75 |
+ "# 3\n\t punpcklbw %%mm7, %%mm0" /* mm0 = [ col[0] unpacked ] */
|
|
76 |
|
|
77 |
- "#2\n\t psubusw %%mm3, %%mm6" /* mm6 = [ 0x10-fracV | fracV | 0x10-fracV | fracV ] */
|
|
78 |
- "#4\n\t movq %%mm1, %%mm3"
|
|
79 |
+ "# 2\n\t psubusw %%mm3, %%mm6" /* mm6 = [ 0x10-fracV | fracV | 0x10-fracV | fracV ] */
|
|
80 |
+ "# 4\n\t movq %%mm1, %%mm3"
|
|
81 |
|
|
82 |
- "#C\n\t pmullw %%mm6, %%mm4" /* mm4 = [ coef[0]|coef[1]|coef[2]|coef[3] ] */
|
|
83 |
- "#5\n\t movq %%mm4, %%mm5"
|
|
84 |
+ "# C\n\t pmullw %%mm6, %%mm4" /* mm4 = [ coef[0]|coef[1]|coef[2]|coef[3] ] */
|
|
85 |
+ "# 5\n\t movq %%mm4, %%mm5"
|
|
86 |
|
|
87 |
- "#4\n\t punpcklbw %%mm7, %%mm1" /* mm1 = [ col[1] unpacked ] */
|
|
88 |
- "#6\n\t punpckhwd %%mm4, %%mm4" /* mm4 = [ coef[1]|coef[1]|coef[0]|coef[0] ] */
|
|
89 |
+ "# 4\n\t punpcklbw %%mm7, %%mm1" /* mm1 = [ col[1] unpacked ] */
|
|
90 |
+ "# 6\n\t punpckhwd %%mm4, %%mm4" /* mm4 = [ coef[1]|coef[1]|coef[0]|coef[0] ] */
|
|
91 |
|
|
92 |
- "#3\n\t punpckhbw %%mm7, %%mm2" /* mm2 = [ col[2] unpacked ] */
|
|
93 |
- "#5\n\t punpcklwd %%mm5, %%mm5" /* mm5 = [ coef[2]|coef[2]|coef[3]|coef[3] ] */
|
|
94 |
+ "# 3\n\t punpckhbw %%mm7, %%mm2" /* mm2 = [ col[2] unpacked ] */
|
|
95 |
+ "# 5\n\t punpcklwd %%mm5, %%mm5" /* mm5 = [ coef[2]|coef[2]|coef[3]|coef[3] ] */
|
|
96 |
|
|
97 |
- "#4\n\t punpckhbw %%mm7, %%mm3" /* mm3 = [ col[3] unpacked ] */
|
|
98 |
- "#5\n\t movq %%mm5, %%mm6"
|
|
99 |
+ "# 4\n\t punpckhbw %%mm7, %%mm3" /* mm3 = [ col[3] unpacked ] */
|
|
100 |
+ "# 5\n\t movq %%mm5, %%mm6"
|
|
101 |
|
|
102 |
- "#6\n\t movq %%mm4, %%mm7"
|
|
103 |
- "#5\n\t punpcklwd %%mm6, %%mm6" /* mm6 = [ coef[3]|coef[3]|coef[3]|coef[3] ] */
|
|
104 |
+ "# 6\n\t movq %%mm4, %%mm7"
|
|
105 |
+ "# 5\n\t punpcklwd %%mm6, %%mm6" /* mm6 = [ coef[3]|coef[3]|coef[3]|coef[3] ] */
|
|
106 |
|
|
107 |
- "#6\n\t punpcklwd %%mm7, %%mm7" /* mm6 = [ coef[1]|coef[1]|coef[1]|coef[1] ] */
|
|
108 |
- "#5\n\t pmullw %%mm6, %%mm3" /* mm3 = [ coef[3] * col[3] unpacked ] */
|
|
109 |
+ "# 6\n\t punpcklwd %%mm7, %%mm7" /* mm6 = [ coef[1]|coef[1]|coef[1]|coef[1] ] */
|
|
110 |
+ "# 5\n\t pmullw %%mm6, %%mm3" /* mm3 = [ coef[3] * col[3] unpacked ] */
|
|
111 |
|
|
112 |
- "#5\n\t punpckhwd %%mm5, %%mm5" /* mm5 = [ coef[2]|coef[2]|coef[2]|coef[2] ] */
|
|
113 |
- "#6\n\t pmullw %%mm7, %%mm1" /* mm1 = [ coef[1] * col[1] unpacked ] */
|
|
114 |
+ "# 5\n\t punpckhwd %%mm5, %%mm5" /* mm5 = [ coef[2]|coef[2]|coef[2]|coef[2] ] */
|
|
115 |
+ "# 6\n\t pmullw %%mm7, %%mm1" /* mm1 = [ coef[1] * col[1] unpacked ] */
|
|
116 |
|
|
117 |
- "#5\n\t pmullw %%mm5, %%mm2" /* mm2 = [ coef[2] * col[2] unpacked ] */
|
|
118 |
- "#6\n\t punpckhwd %%mm4, %%mm4" /* mm4 = [ coef[0]|coef[0]|coef[0]|coef[0] ] */
|
|
119 |
+ "# 5\n\t pmullw %%mm5, %%mm2" /* mm2 = [ coef[2] * col[2] unpacked ] */
|
|
120 |
+ "# 6\n\t punpckhwd %%mm4, %%mm4" /* mm4 = [ coef[0]|coef[0]|coef[0]|coef[0] ] */
|
|
121 |
|
|
122 |
- "#6\n\t pmullw %%mm4, %%mm0" /* mm0 = [ coef[0] * col[0] unpacked ] */
|
|
123 |
- "#7\n\t paddw %%mm2, %%mm3"
|
|
124 |
- "#7\n\t paddw %%mm1, %%mm0"
|
|
125 |
+ "# 6\n\t pmullw %%mm4, %%mm0" /* mm0 = [ coef[0] * col[0] unpacked ] */
|
|
126 |
+ "# 7\n\t paddw %%mm2, %%mm3"
|
|
127 |
+ "# 7\n\t paddw %%mm1, %%mm0"
|
|
128 |
|
|
129 |
- "#7\n\t paddw %%mm3, %%mm0"
|
|
130 |
- "#7\n\t psrlw $8, %%mm0"
|
|
131 |
+ "# 7\n\t paddw %%mm3, %%mm0"
|
|
132 |
+ "# 7\n\t psrlw $8, %%mm0"
|
|
133 |
|
|
134 |
/* Unpacking the resulting pixel */
|
|
135 |
"\n\t packuswb %%mm7, %%mm0"
|