Mercurial > mplayer.hg

comparison libmpeg2/libmpeg-0.4.1.diff @ 26046:b65b71ba0e16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly detect ARM mc acceleration.
author diego
date Sat, 23 Feb 2008 19:29:28 +0000
parents 7a541b991b85
children 9153b0e6ab23
comparison
equal deleted inserted replaced
26045:a8ea87c71d18 26046:b65b71ba0e16
256 @@ -67,6 +67,16 @@ 256 @@ -67,6 +67,16 @@
257 mpeg2_mc = mpeg2_mc_vis; 257 mpeg2_mc = mpeg2_mc_vis;
258 else 258 else
259 #endif 259 #endif
260 +#ifdef ARCH_ARM 260 +#ifdef ARCH_ARM
261 + if (1 /*accel & MPEG2_ACCEL_ARM*/) { 261 + if (accel & MPEG2_ACCEL_ARM) {
262 +#ifdef HAVE_IWMMXT 262 +#ifdef HAVE_IWMMXT
263 + if (1 /*accel & MPEG2_ACCEL_ARM_IWMMXT*/) 263 + if (accel & MPEG2_ACCEL_ARM_IWMMXT)
264 + mpeg2_mc = mpeg2_mc_iwmmxt; 264 + mpeg2_mc = mpeg2_mc_iwmmxt;
265 + else 265 + else
266 +#endif 266 +#endif
267 + mpeg2_mc = mpeg2_mc_arm; 267 + mpeg2_mc = mpeg2_mc_arm;
268 + } else 268 + } else
289 #define PIC_FLAG_TAGS 128 289 #define PIC_FLAG_TAGS 128
290 +#define PIC_FLAG_REPEAT_FIRST_FIELD 256 290 +#define PIC_FLAG_REPEAT_FIRST_FIELD 256
291 #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000 291 #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
292 292
293 typedef struct mpeg2_picture_s { 293 typedef struct mpeg2_picture_s {
294 @@ -154,6 +159,7 @@ 294 @@ -156,12 +160,13 @@
295 #define MPEG2_ACCEL_X86_MMX 1
296 #define MPEG2_ACCEL_X86_3DNOW 2 295 #define MPEG2_ACCEL_X86_3DNOW 2
297 #define MPEG2_ACCEL_X86_MMXEXT 4 296 #define MPEG2_ACCEL_X86_MMXEXT 4
298 +#define MPEG2_ACCEL_X86_SSE2 8 297 #define MPEG2_ACCEL_X86_SSE2 8
298 -#define MPEG2_ACCEL_X86_SSE3 16
299 #define MPEG2_ACCEL_PPC_ALTIVEC 1 299 #define MPEG2_ACCEL_PPC_ALTIVEC 1
300 #define MPEG2_ACCEL_ALPHA 1 300 #define MPEG2_ACCEL_ALPHA 1
301 #define MPEG2_ACCEL_ALPHA_MVI 2 301 #define MPEG2_ACCEL_ALPHA_MVI 2
302 #define MPEG2_ACCEL_SPARC_VIS 1
303 #define MPEG2_ACCEL_SPARC_VIS2 2
304 +#define MPEG2_ACCEL_ARM 1
305 +#define MPEG2_ACCEL_ARM_IWMMXT 2
306 #define MPEG2_ACCEL_DETECT 0x80000000
307
308 uint32_t mpeg2_accel (uint32_t accel);
302 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200 309 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200
303 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200 310 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200
304 @@ -144,6 +148,12 @@ 311 @@ -144,6 +148,12 @@
305 int second_field; 312 int second_field;
306 313