Mercurial > mplayer.hg

comparison libmpeg2/libmpeg2_changes.diff @ 28796:621228f94c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync local changes file with #ifdef --> #if conversion.
author diego
date Fri, 06 Mar 2009 00:10:17 +0000
parents 31287e75b5d8
children e83eef58b30a
comparison
equal deleted inserted replaced
28795:689a357fdb1b 28796:621228f94c83
4 #include "attributes.h" 4 #include "attributes.h"
5 #include "mpeg2_internal.h" 5 #include "mpeg2_internal.h"
6 6
7 +#include "cpudetect.h" 7 +#include "cpudetect.h"
8 + 8 +
9 #if defined(ARCH_X86) || defined(ARCH_X86_64) 9 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
10 +#if ARCH_X86 || ARCH_X86_64
10 static inline uint32_t arch_accel (uint32_t accel) 11 static inline uint32_t arch_accel (uint32_t accel)
11 { 12 {
12 +/* Use MPlayer CPU detection instead of libmpeg2 variant. */ 13 +/* Use MPlayer CPU detection instead of libmpeg2 variant. */
13 +#if 0 14 +#if 0
14 if (accel & (MPEG2_ACCEL_X86_3DNOW | MPEG2_ACCEL_X86_MMXEXT)) 15 if (accel & (MPEG2_ACCEL_X86_3DNOW | MPEG2_ACCEL_X86_MMXEXT))
34 + 35 +
35 +#endif /* 0 */ 36 +#endif /* 0 */
36 } 37 }
37 #endif /* ARCH_X86 || ARCH_X86_64 */ 38 #endif /* ARCH_X86 || ARCH_X86_64 */
38 39
40 @@ -127,7 +150,7 @@
41 }
42 #endif /* ARCH_X86 || ARCH_X86_64 */
43
44 -#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || defined(ARCH_SPARC))
45 +#if defined(ACCEL_DETECT) && (ARCH_PPC || ARCH_SPARC)
46 #include <signal.h>
47 #include <setjmp.h>
48
49 @@ -146,7 +169,7 @@
50 }
51 #endif /* ACCEL_DETECT && (ARCH_PPC || ARCH_SPARC) */
52
53 -#ifdef ARCH_PPC
54 +#if ARCH_PPC
55 static uint32_t arch_accel (uint32_t accel)
56 {
57 #ifdef ACCEL_DETECT
58 @@ -183,7 +206,7 @@
59 }
60 #endif /* ARCH_PPC */
61
62 -#ifdef ARCH_SPARC
63 +#if ARCH_SPARC
64 static uint32_t arch_accel (uint32_t accel)
65 {
66 if (accel & MPEG2_ACCEL_SPARC_VIS2)
67 @@ -229,7 +252,7 @@
68 }
69 #endif /* ARCH_SPARC */
70
71 -#ifdef ARCH_ALPHA
72 +#if ARCH_ALPHA
73 static inline uint32_t arch_accel (uint32_t accel)
74 {
75 if (accel & MPEG2_ACCEL_ALPHA_MVI)
76 @@ -253,7 +276,7 @@
77
78 uint32_t mpeg2_detect_accel (uint32_t accel)
79 {
80 -#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
81 +#if ARCH_X86 || ARCH_X86_64 || ARCH_PPC || ARCH_ALPHA || ARCH_SPARC
82 accel = arch_accel (accel);
83 #endif
84 return accel;
85 Index: libmpeg2/cpu_state.c
86 ===================================================================
87 --- libmpeg2/cpu_state.c (revision 28324)
88 +++ libmpeg2/cpu_state.c (revision 28325)
89 @@ -29,21 +29,21 @@
90 #include "mpeg2.h"
91 #include "attributes.h"
92 #include "mpeg2_internal.h"
93 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
94 +#if ARCH_X86 || ARCH_X86_64
95 #include "mmx.h"
96 #endif
97
98 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
99 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
100
101 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
102 +#if ARCH_X86 || ARCH_X86_64
103 static void state_restore_mmx (cpu_state_t * state)
104 {
105 emms ();
106 }
107 #endif
108
109 -#ifdef ARCH_PPC
110 +#if ARCH_PPC
111 #if defined(__APPLE_CC__) /* apple */
112 #define LI(a,b) "li r" #a "," #b "\n\t"
113 #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t"
114 @@ -115,12 +115,12 @@
115
116 void mpeg2_cpu_state_init (uint32_t accel)
117 {
118 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
119 +#if ARCH_X86 || ARCH_X86_64
120 if (accel & MPEG2_ACCEL_X86_MMX) {
121 mpeg2_cpu_state_restore = state_restore_mmx;
122 }
123 #endif
124 -#ifdef ARCH_PPC
125 +#if ARCH_PPC
126 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
127 mpeg2_cpu_state_save = state_save_altivec;
128 mpeg2_cpu_state_restore = state_restore_altivec;
39 --- libmpeg2/decode.c 2006-06-16 20:12:26.000000000 +0200 129 --- libmpeg2/decode.c 2006-06-16 20:12:26.000000000 +0200
40 +++ libmpeg2/decode.c 2006-06-16 20:12:50.000000000 +0200 130 +++ libmpeg2/decode.c 2006-06-16 20:12:50.000000000 +0200
41 @@ -345,6 +349,15 @@ 131 @@ -345,6 +349,15 @@
42 fbuf->buf[1] = buf[1]; 132 fbuf->buf[1] = buf[1];
43 fbuf->buf[2] = buf[2]; 133 fbuf->buf[2] = buf[2];
79 @@ -235,34 +239,40 @@ 169 @@ -235,34 +239,40 @@
80 170
81 void mpeg2_idct_init (uint32_t accel) 171 void mpeg2_idct_init (uint32_t accel)
82 { 172 {
83 -#ifdef ARCH_X86 173 -#ifdef ARCH_X86
84 +#ifdef HAVE_SSE2 174 +#if HAVE_SSE2
85 if (accel & MPEG2_ACCEL_X86_SSE2) { 175 if (accel & MPEG2_ACCEL_X86_SSE2) {
86 mpeg2_idct_copy = mpeg2_idct_copy_sse2; 176 mpeg2_idct_copy = mpeg2_idct_copy_sse2;
87 mpeg2_idct_add = mpeg2_idct_add_sse2; 177 mpeg2_idct_add = mpeg2_idct_add_sse2;
88 mpeg2_idct_mmx_init (); 178 mpeg2_idct_mmx_init ();
89 - } else if (accel & MPEG2_ACCEL_X86_MMXEXT) { 179 - } else if (accel & MPEG2_ACCEL_X86_MMXEXT) {
101 mpeg2_idct_add = mpeg2_idct_add_mmx; 191 mpeg2_idct_add = mpeg2_idct_add_mmx;
102 mpeg2_idct_mmx_init (); 192 mpeg2_idct_mmx_init ();
103 } else 193 } else
104 #endif 194 #endif
105 -#ifdef ARCH_PPC 195 -#ifdef ARCH_PPC
106 +#ifdef HAVE_ALTIVEC 196 +#if HAVE_ALTIVEC
107 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { 197 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
108 mpeg2_idct_copy = mpeg2_idct_copy_altivec; 198 mpeg2_idct_copy = mpeg2_idct_copy_altivec;
109 mpeg2_idct_add = mpeg2_idct_add_altivec; 199 mpeg2_idct_add = mpeg2_idct_add_altivec;
110 mpeg2_idct_altivec_init (); 200 mpeg2_idct_altivec_init ();
111 } else 201 } else
112 #endif 202 #endif
113 -#ifdef ARCH_ALPHA 203 -#ifdef ARCH_ALPHA
114 +#ifdef HAVE_MVI 204 +#if HAVE_MVI
115 if (accel & MPEG2_ACCEL_ALPHA_MVI) { 205 if (accel & MPEG2_ACCEL_ALPHA_MVI) {
116 mpeg2_idct_copy = mpeg2_idct_copy_mvi; 206 mpeg2_idct_copy = mpeg2_idct_copy_mvi;
117 mpeg2_idct_add = mpeg2_idct_add_mvi; 207 mpeg2_idct_add = mpeg2_idct_add_mvi;
118 mpeg2_idct_alpha_init (); 208 mpeg2_idct_alpha_init ();
119 - } else if (accel & MPEG2_ACCEL_ALPHA) { 209 - } else if (accel & MPEG2_ACCEL_ALPHA) {
121 +#elif ARCH_ALPHA 211 +#elif ARCH_ALPHA
122 + if (accel & MPEG2_ACCEL_ALPHA) { 212 + if (accel & MPEG2_ACCEL_ALPHA) {
123 int i; 213 int i;
124 214
125 mpeg2_idct_copy = mpeg2_idct_copy_alpha; 215 mpeg2_idct_copy = mpeg2_idct_copy_alpha;
216 Index: libmpeg2/idct_alpha.c
217 ===================================================================
218 --- libmpeg2/idct_alpha.c (revision 28324)
219 +++ libmpeg2/idct_alpha.c (revision 28325)
220 @@ -24,7 +24,7 @@
221
222 #include "config.h"
223
224 -#ifdef ARCH_ALPHA
225 +#if ARCH_ALPHA
226
227 #include <stdlib.h>
228 #include <inttypes.h>
229 Index: libmpeg2/idct_altivec.c
230 ===================================================================
231 --- libmpeg2/idct_altivec.c (revision 28324)
232 +++ libmpeg2/idct_altivec.c (revision 28325)
233 @@ -23,7 +23,7 @@
234
235 #include "config.h"
236
237 -#ifdef ARCH_PPC
238 +#if ARCH_PPC
239
240 #ifdef HAVE_ALTIVEC_H
241 #include <altivec.h>
242 Index: libmpeg2/idct_mmx.c
243 ===================================================================
244 --- libmpeg2/idct_mmx.c (revision 28324)
245 +++ libmpeg2/idct_mmx.c (revision 28325)
246 @@ -23,7 +23,7 @@
247
248 #include "config.h"
249
250 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
251 +#if ARCH_X86 || ARCH_X86_64
252
253 #include <inttypes.h>
254
126 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200 255 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200
127 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200 256 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200
128 @@ -33,16 +37,22 @@ 257 @@ -33,34 +37,40 @@
129 258
130 void mpeg2_mc_init (uint32_t accel) 259 void mpeg2_mc_init (uint32_t accel)
131 { 260 {
132 -#ifdef ARCH_X86 261 -#ifdef ARCH_X86
133 +#ifdef HAVE_MMX2 262 +#if HAVE_MMX2
134 if (accel & MPEG2_ACCEL_X86_MMXEXT) 263 if (accel & MPEG2_ACCEL_X86_MMXEXT)
135 mpeg2_mc = mpeg2_mc_mmxext; 264 mpeg2_mc = mpeg2_mc_mmxext;
136 - else if (accel & MPEG2_ACCEL_X86_3DNOW) 265 - else if (accel & MPEG2_ACCEL_X86_3DNOW)
137 + else 266 + else
138 +#endif 267 +#endif
139 +#ifdef HAVE_AMD3DNOW 268 +#if HAVE_AMD3DNOW
140 + if (accel & MPEG2_ACCEL_X86_3DNOW) 269 + if (accel & MPEG2_ACCEL_X86_3DNOW)
141 mpeg2_mc = mpeg2_mc_3dnow; 270 mpeg2_mc = mpeg2_mc_3dnow;
142 - else if (accel & MPEG2_ACCEL_X86_MMX) 271 - else if (accel & MPEG2_ACCEL_X86_MMX)
143 + else 272 + else
144 +#endif 273 +#endif
145 +#ifdef HAVE_MMX 274 +#if HAVE_MMX
146 + if (accel & MPEG2_ACCEL_X86_MMX) 275 + if (accel & MPEG2_ACCEL_X86_MMX)
147 mpeg2_mc = mpeg2_mc_mmx; 276 mpeg2_mc = mpeg2_mc_mmx;
148 else 277 else
149 #endif 278 #endif
150 -#ifdef ARCH_PPC 279 -#ifdef ARCH_PPC
151 +#ifdef HAVE_ALTIVEC 280 +#if HAVE_ALTIVEC
152 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) 281 if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
153 mpeg2_mc = mpeg2_mc_altivec; 282 mpeg2_mc = mpeg2_mc_altivec;
154 else 283 else
155 @@ -52,15 +62,15 @@ 284 #endif
285 -#ifdef ARCH_ALPHA
286 +#if ARCH_ALPHA
287 if (accel & MPEG2_ACCEL_ALPHA)
156 mpeg2_mc = mpeg2_mc_alpha; 288 mpeg2_mc = mpeg2_mc_alpha;
157 else 289 else
158 #endif 290 #endif
159 -#ifdef ARCH_SPARC 291 -#ifdef ARCH_SPARC
160 +#ifdef HAVE_VIS 292 +#if HAVE_VIS
161 if (accel & MPEG2_ACCEL_SPARC_VIS) 293 if (accel & MPEG2_ACCEL_SPARC_VIS)
162 mpeg2_mc = mpeg2_mc_vis; 294 mpeg2_mc = mpeg2_mc_vis;
163 else 295 else
164 #endif 296 #endif
165 #ifdef ARCH_ARM 297 -#ifdef ARCH_ARM
298 +#if ARCH_ARM
166 - if (accel & MPEG2_ACCEL_ARM) { 299 - if (accel & MPEG2_ACCEL_ARM) {
167 + if (accel & MPEG2_ACCEL_ARM) 300 + if (accel & MPEG2_ACCEL_ARM)
168 mpeg2_mc = mpeg2_mc_arm; 301 mpeg2_mc = mpeg2_mc_arm;
169 - } else 302 - } else
170 + else 303 + else
171 #endif 304 #endif
172 mpeg2_mc = mpeg2_mc_c; 305 mpeg2_mc = mpeg2_mc_c;
173 } 306 }
307 Index: libmpeg2/motion_comp_alpha.c
308 ===================================================================
309 --- libmpeg2/motion_comp_alpha.c (revision 28324)
310 +++ libmpeg2/motion_comp_alpha.c (revision 28325)
311 @@ -22,7 +22,7 @@
312
313 #include "config.h"
314
315 -#ifdef ARCH_ALPHA
316 +#if ARCH_ALPHA
317
318 #include <inttypes.h>
319
320 Index: libmpeg2/motion_comp_altivec.c
321 ===================================================================
322 --- libmpeg2/motion_comp_altivec.c (revision 28324)
323 +++ libmpeg2/motion_comp_altivec.c (revision 28325)
324 @@ -23,7 +23,7 @@
325
326 #include "config.h"
327
328 -#ifdef ARCH_PPC
329 +#if ARCH_PPC
330
331 #ifdef HAVE_ALTIVEC_H
332 #include <altivec.h>
333 Index: libmpeg2/motion_comp_arm.c
334 ===================================================================
335 --- libmpeg2/motion_comp_arm.c (revision 28324)
336 +++ libmpeg2/motion_comp_arm.c (revision 28325)
337 @@ -22,7 +22,7 @@
338
339 #include "config.h"
340
341 -#ifdef ARCH_ARM
342 +#if ARCH_ARM
343
344 #include <inttypes.h>
345
346 Index: libmpeg2/motion_comp_mmx.c
347 ===================================================================
348 --- libmpeg2/motion_comp_mmx.c (revision 28324)
349 +++ libmpeg2/motion_comp_mmx.c (revision 28325)
350 @@ -23,7 +23,7 @@
351
352 #include "config.h"
353
354 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
355 +#if ARCH_X86 || ARCH_X86_64
356
357 #include <inttypes.h>
358
359 Index: libmpeg2/motion_comp_vis.c
360 ===================================================================
361 --- libmpeg2/motion_comp_vis.c (revision 28324)
362 +++ libmpeg2/motion_comp_vis.c (revision 28325)
363 @@ -22,7 +22,7 @@
364
365 #include "config.h"
366
367 -#ifdef ARCH_SPARC
368 +#if ARCH_SPARC
369
370 #include <inttypes.h>
371
174 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200 372 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200
175 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200 373 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200
176 @@ -152,6 +156,11 @@ 374 @@ -152,6 +156,11 @@
177 375
178 /* XXX: stuff due to xine shit */ 376 /* XXX: stuff due to xine shit */
193 + unsigned char *pending_buffer; 391 + unsigned char *pending_buffer;
194 + int pending_length; 392 + int pending_length;
195 }; 393 };
196 394
197 typedef struct { 395 typedef struct {
396 @@ -226,7 +238,7 @@
397 };
398
399 typedef struct {
400 -#ifdef ARCH_PPC
401 +#if ARCH_PPC
402 uint8_t regv[12*16];
403 #endif
404 int dummy;
198 --- libmpeg2/slice.c 2006-06-16 20:12:26.000000000 +0200 405 --- libmpeg2/slice.c 2006-06-16 20:12:26.000000000 +0200
199 +++ libmpeg2/slice.c 2006-06-16 20:12:50.000000000 +0200 406 +++ libmpeg2/slice.c 2006-06-16 20:12:50.000000000 +0200
200 @@ -142,6 +146,7 @@ 407 @@ -142,6 +146,7 @@
201 408
202 quantizer_scale_code = UBITS (bit_buf, 5); 409 quantizer_scale_code = UBITS (bit_buf, 5);