annotate libmpeg2/libmpeg2_changes.diff @ 34754:9d4720deada1

Use approach used by ao_oss to avoid audio desync when framestepping with ao_alsa and no hardware pause support. This fixes bug #2052.
author reimar
date Thu, 05 Apr 2012 22:29:37 +0000
parents 32a214ee10e5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
1 --- libmpeg2/cpu_accel.c 2006-06-16 20:12:26.000000000 +0200
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
2 +++ libmpeg2/cpu_accel.c 2006-06-16 20:12:50.000000000 +0200
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
3 @@ -29,9 +33,13 @@
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
4 #include "attributes.h"
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
5 #include "mpeg2_internal.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
6
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
7 +#include "cpudetect.h"
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
8 +
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
9 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
10 +#if ARCH_X86 || ARCH_X86_64
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
11 static inline uint32_t arch_accel (uint32_t accel)
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
12 {
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
13 +/* Use MPlayer CPU detection instead of libmpeg2 variant. */
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
14 +#if 0
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
15 if (accel & (MPEG2_ACCEL_X86_3DNOW | MPEG2_ACCEL_X86_MMXEXT))
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
16 accel |= MPEG2_ACCEL_X86_MMX;
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
17
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
18 @@ -124,6 +132,21 @@
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
19 #endif /* ACCEL_DETECT */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
20
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
21 return accel;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
22 +
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
23 +#else /* 0 */
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
24 + accel = 0;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
25 + if (gCpuCaps.hasMMX)
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
26 + accel |= MPEG2_ACCEL_X86_MMX;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
27 + if (gCpuCaps.hasSSE2)
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
28 + accel |= MPEG2_ACCEL_X86_SSE2;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
29 + if (gCpuCaps.hasMMX2)
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
30 + accel |= MPEG2_ACCEL_X86_MMXEXT;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
31 + if (gCpuCaps.has3DNow)
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
32 + accel |= MPEG2_ACCEL_X86_3DNOW;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
33 +
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
34 + return accel;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
35 +
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
36 +#endif /* 0 */
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
37 }
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
38 #endif /* ARCH_X86 || ARCH_X86_64 */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
39
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
40 @@ -127,7 +150,7 @@
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
41 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
42 #endif /* ARCH_X86 || ARCH_X86_64 */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
43
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
44 -#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || defined(ARCH_SPARC))
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
45 +#if defined(ACCEL_DETECT) && (ARCH_PPC || ARCH_SPARC)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
46 #include <signal.h>
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
47 #include <setjmp.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
48
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
49 @@ -146,7 +169,7 @@
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
50 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
51 #endif /* ACCEL_DETECT && (ARCH_PPC || ARCH_SPARC) */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
52
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
53 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
54 +#if ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
55 static uint32_t arch_accel (uint32_t accel)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
56 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
57 #ifdef ACCEL_DETECT
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
58 @@ -183,7 +206,7 @@
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
59 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
60 #endif /* ARCH_PPC */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
61
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
62 -#ifdef ARCH_SPARC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
63 +#if ARCH_SPARC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
64 static uint32_t arch_accel (uint32_t accel)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
65 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
66 if (accel & MPEG2_ACCEL_SPARC_VIS2)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
67 @@ -229,7 +252,7 @@
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
68 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
69 #endif /* ARCH_SPARC */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
70
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
71 -#ifdef ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
72 +#if ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
73 static inline uint32_t arch_accel (uint32_t accel)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
74 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
75 if (accel & MPEG2_ACCEL_ALPHA_MVI)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
76 @@ -253,7 +276,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
77
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
78 uint32_t mpeg2_detect_accel (uint32_t accel)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
79 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
80 -#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
81 +#if ARCH_X86 || ARCH_X86_64 || ARCH_PPC || ARCH_ALPHA || ARCH_SPARC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
82 accel = arch_accel (accel);
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
83 #endif
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
84 return accel;
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
85 Index: libmpeg2/cpu_state.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
86 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
87 --- libmpeg2/cpu_state.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
88 +++ libmpeg2/cpu_state.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
89 @@ -29,21 +29,21 @@
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
90 #include "mpeg2.h"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
91 #include "attributes.h"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
92 #include "mpeg2_internal.h"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
93 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
94 +#if ARCH_X86 || ARCH_X86_64
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
95 #include "mmx.h"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
96 #endif
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
97
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
98 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
99 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
100
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
101 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
102 +#if ARCH_X86 || ARCH_X86_64
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
103 static void state_restore_mmx (cpu_state_t * state)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
104 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
105 emms ();
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
106 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
107 #endif
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
108
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
109 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
110 +#if ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
111 #if defined(__APPLE_CC__) /* apple */
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
112 #define LI(a,b) "li r" #a "," #b "\n\t"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
113 #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t"
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
114 @@ -115,12 +115,12 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
115
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
116 void mpeg2_cpu_state_init (uint32_t accel)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
117 {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
118 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
119 +#if ARCH_X86 || ARCH_X86_64
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
120 if (accel & MPEG2_ACCEL_X86_MMX) {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
121 mpeg2_cpu_state_restore = state_restore_mmx;
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
122 }
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
123 #endif
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
124 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
125 +#if ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
126 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
127 mpeg2_cpu_state_save = state_save_altivec;
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
128 mpeg2_cpu_state_restore = state_restore_altivec;
31329
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
129 --- libmpeg2/header.c 2006-06-16 20:12:26.000000000 +0200
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
130 +++ libmpeg2/header.c 2006-06-16 20:12:50.000000000 +0200
31860
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
131 @@ -872,6 +876,7 @@
31329
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
132 mpeg2dec->scaled[idx] = decoder->q_scale_type;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
133 for (i = 0; i < 32; i++) {
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
134 k = decoder->q_scale_type ? non_linear_scale[i] : (i << 1);
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
135 + decoder->quantizer_scales[i] = k;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
136 for (j = 0; j < 64; j++)
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
137 decoder->quantizer_prescale[idx][i][j] =
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
138 k * mpeg2dec->quantizer_matrix[idx][j];
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
139 --- libmpeg2/idct.c (revision 26652)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
140 +++ libmpeg2/idct.c (working copy)
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
141 @@ -235,34 +239,40 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
142
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
143 void mpeg2_idct_init (uint32_t accel)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
144 {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
145 -#ifdef ARCH_X86
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
146 +#if HAVE_SSE2
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
147 if (accel & MPEG2_ACCEL_X86_SSE2) {
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
148 mpeg2_idct_copy = mpeg2_idct_copy_sse2;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
149 mpeg2_idct_add = mpeg2_idct_add_sse2;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
150 mpeg2_idct_mmx_init ();
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
151 - } else if (accel & MPEG2_ACCEL_X86_MMXEXT) {
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
152 + } else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
153 +#elif HAVE_MMX2
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
154 + if (accel & MPEG2_ACCEL_X86_MMXEXT) {
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
155 mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
156 mpeg2_idct_add = mpeg2_idct_add_mmxext;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
157 mpeg2_idct_mmx_init ();
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
158 - } else if (accel & MPEG2_ACCEL_X86_MMX) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
159 + } else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
160 +#elif HAVE_MMX
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
161 + if (accel & MPEG2_ACCEL_X86_MMX) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
162 mpeg2_idct_copy = mpeg2_idct_copy_mmx;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
163 mpeg2_idct_add = mpeg2_idct_add_mmx;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
164 mpeg2_idct_mmx_init ();
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
165 } else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
166 #endif
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
167 -#ifdef ARCH_PPC
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
168 +#if HAVE_ALTIVEC
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
169 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
170 mpeg2_idct_copy = mpeg2_idct_copy_altivec;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
171 mpeg2_idct_add = mpeg2_idct_add_altivec;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
172 mpeg2_idct_altivec_init ();
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
173 } else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
174 #endif
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
175 -#ifdef ARCH_ALPHA
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
176 +#if HAVE_MVI
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
177 if (accel & MPEG2_ACCEL_ALPHA_MVI) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
178 mpeg2_idct_copy = mpeg2_idct_copy_mvi;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
179 mpeg2_idct_add = mpeg2_idct_add_mvi;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
180 mpeg2_idct_alpha_init ();
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
181 - } else if (accel & MPEG2_ACCEL_ALPHA) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
182 + } else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
183 +#elif ARCH_ALPHA
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
184 + if (accel & MPEG2_ACCEL_ALPHA) {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
185 int i;
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
186
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
187 mpeg2_idct_copy = mpeg2_idct_copy_alpha;
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
188 Index: libmpeg2/idct_alpha.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
189 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
190 --- libmpeg2/idct_alpha.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
191 +++ libmpeg2/idct_alpha.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
192 @@ -24,7 +24,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
193
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
194 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
195
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
196 -#ifdef ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
197 +#if ARCH_ALPHA
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
198
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
199 #include <stdlib.h>
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
200 #include <inttypes.h>
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
201 Index: libmpeg2/idct_altivec.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
202 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
203 --- libmpeg2/idct_altivec.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
204 +++ libmpeg2/idct_altivec.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
205 @@ -23,7 +23,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
206
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
207 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
208
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
209 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
210 +#if ARCH_PPC
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
211
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
212 #ifdef HAVE_ALTIVEC_H
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
213 #include <altivec.h>
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
214 Index: libmpeg2/idct_mmx.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
215 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
216 --- libmpeg2/idct_mmx.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
217 +++ libmpeg2/idct_mmx.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
218 @@ -23,7 +23,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
219
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
220 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
221
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
222 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
223 +#if ARCH_X86 || ARCH_X86_64
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
224
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
225 #include <inttypes.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
226
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
227 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
228 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
229 @@ -33,34 +37,40 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
230
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
231 void mpeg2_mc_init (uint32_t accel)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
232 {
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
233 -#ifdef ARCH_X86
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
234 +#if HAVE_MMX2
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
235 if (accel & MPEG2_ACCEL_X86_MMXEXT)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
236 mpeg2_mc = mpeg2_mc_mmxext;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
237 - else if (accel & MPEG2_ACCEL_X86_3DNOW)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
238 + else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
239 +#endif
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
240 +#if HAVE_AMD3DNOW
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
241 + if (accel & MPEG2_ACCEL_X86_3DNOW)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
242 mpeg2_mc = mpeg2_mc_3dnow;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
243 - else if (accel & MPEG2_ACCEL_X86_MMX)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
244 + else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
245 +#endif
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
246 +#if HAVE_MMX
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
247 + if (accel & MPEG2_ACCEL_X86_MMX)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
248 mpeg2_mc = mpeg2_mc_mmx;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
249 else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
250 #endif
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
251 -#ifdef ARCH_PPC
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
252 +#if HAVE_ALTIVEC
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
253 if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
254 mpeg2_mc = mpeg2_mc_altivec;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
255 else
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
256 #endif
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
257 -#ifdef ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
258 +#if ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
259 if (accel & MPEG2_ACCEL_ALPHA)
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
260 mpeg2_mc = mpeg2_mc_alpha;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
261 else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
262 #endif
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
263 -#ifdef ARCH_SPARC
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
264 +#if HAVE_VIS
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
265 if (accel & MPEG2_ACCEL_SPARC_VIS)
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
266 mpeg2_mc = mpeg2_mc_vis;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
267 else
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
268 #endif
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
269 -#ifdef ARCH_ARM
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
270 +#if ARCH_ARM
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
271 - if (accel & MPEG2_ACCEL_ARM) {
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
272 + if (accel & MPEG2_ACCEL_ARM)
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
273 mpeg2_mc = mpeg2_mc_arm;
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
274 - } else
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
275 + else
27573
1645692c116e Sync diff with libmpeg2 update.
diego
parents: 27569
diff changeset
276 #endif
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
277 mpeg2_mc = mpeg2_mc_c;
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
278 }
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
279 Index: libmpeg2/motion_comp_alpha.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
280 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
281 --- libmpeg2/motion_comp_alpha.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
282 +++ libmpeg2/motion_comp_alpha.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
283 @@ -22,7 +22,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
284
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
285 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
286
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
287 -#ifdef ARCH_ALPHA
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
288 +#if ARCH_ALPHA
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
289
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
290 #include <inttypes.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
291
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
292 Index: libmpeg2/motion_comp_altivec.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
293 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
294 --- libmpeg2/motion_comp_altivec.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
295 +++ libmpeg2/motion_comp_altivec.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
296 @@ -23,7 +23,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
297
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
298 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
299
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
300 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
301 +#if ARCH_PPC
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
302
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
303 #ifdef HAVE_ALTIVEC_H
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
304 #include <altivec.h>
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
305 Index: libmpeg2/motion_comp_arm.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
306 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
307 --- libmpeg2/motion_comp_arm.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
308 +++ libmpeg2/motion_comp_arm.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
309 @@ -22,7 +22,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
310
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
311 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
312
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
313 -#ifdef ARCH_ARM
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
314 +#if ARCH_ARM
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
315
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
316 #include <inttypes.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
317
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
318 Index: libmpeg2/motion_comp_mmx.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
319 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
320 --- libmpeg2/motion_comp_mmx.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
321 +++ libmpeg2/motion_comp_mmx.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
322 @@ -23,7 +23,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
323
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
324 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
325
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
326 -#if defined(ARCH_X86) || defined(ARCH_X86_64)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
327 +#if ARCH_X86 || ARCH_X86_64
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
328
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
329 #include <inttypes.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
330
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
331 Index: libmpeg2/motion_comp_vis.c
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
332 ===================================================================
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
333 --- libmpeg2/motion_comp_vis.c (revision 28324)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
334 +++ libmpeg2/motion_comp_vis.c (revision 28325)
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
335 @@ -22,7 +22,7 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
336
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
337 #include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
338
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
339 -#ifdef ARCH_SPARC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
340 +#if ARCH_SPARC
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
341
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
342 #include <inttypes.h>
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
343
27569
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
344 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200
7c3d535aba22 Remove version string from name of local changes diff file.
diego
parents:
diff changeset
345 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200
31329
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
346 @@ -152,6 +156,11 @@
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
347
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
348 /* XXX: stuff due to xine shit */
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
349 int8_t q_scale_type;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
350 +
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
351 + int quantizer_scales[32];
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
352 + int quantizer_scale;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
353 + char* quant_store;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
354 + int quant_stride;
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
355 };
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
356
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
357 typedef struct {
31860
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
358 @@ -226,7 +235,7 @@
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
359 };
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28796
diff changeset
360
28796
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
361 typedef struct {
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
362 -#ifdef ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
363 +#if ARCH_PPC
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
364 uint8_t regv[12*16];
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
365 #endif
621228f94c83 Sync local changes file with #ifdef --> #if conversion.
diego
parents: 28335
diff changeset
366 int dummy;
31329
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
367 --- libmpeg2/slice.c 2006-06-16 20:12:26.000000000 +0200
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
368 +++ libmpeg2/slice.c 2006-06-16 20:12:50.000000000 +0200
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
369 @@ -142,6 +146,7 @@
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
370
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
371 quantizer_scale_code = UBITS (bit_buf, 5);
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
372 DUMPBITS (bit_buf, bits, 5);
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
373 + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code];
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
374
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
375 decoder->quantizer_matrix[0] =
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
376 decoder->quantizer_prescale[0][quantizer_scale_code];
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
377 @@ -1564,6 +1569,24 @@
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
378
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
379 #define NEXT_MACROBLOCK \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
380 do { \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
381 + if(decoder->quant_store) { \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
382 + if (decoder->picture_structure == TOP_FIELD) \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
383 + decoder->quant_store[2 * decoder->quant_stride \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
384 + * (decoder->v_offset >> 4) \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
385 + + (decoder->offset >> 4)] \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
386 + = decoder->quantizer_scale; \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
387 + else if (decoder->picture_structure == BOTTOM_FIELD) \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
388 + decoder->quant_store[2 * decoder->quant_stride \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
389 + * (decoder->v_offset >> 4) \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
390 + + decoder->quant_stride \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
391 + + (decoder->offset >> 4)] \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
392 + = decoder->quantizer_scale; \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
393 + else \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
394 + decoder->quant_store[decoder->quant_stride \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
395 + * (decoder->v_offset >> 4) \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
396 + + (decoder->offset >> 4)] \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
397 + = decoder->quantizer_scale; \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
398 + } \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
399 decoder->offset += 16; \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
400 if (decoder->offset == decoder->width) { \
60709ef498be Reinstate libmpeg2 hook to export quantization
lu_zero
parents: 31293
diff changeset
401 do { /* just so we can use the break statement */ \
31860
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
402 --- libmpeg2/decode.c (revision 31938)
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
403 +++ libmpeg2/decode.c (working copy)
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
404 @@ -345,6 +345,13 @@
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
405 fbuf->buf[1] = buf[1];
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
406 fbuf->buf[2] = buf[2];
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
407 fbuf->id = id;
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
408 + // HACK! FIXME! At first I frame, copy pointers to prediction frame too!
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
409 + if (mpeg2dec->custom_fbuf && !mpeg2dec->fbuf[1]->buf[0]) {
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
410 + mpeg2dec->fbuf[1]->buf[0] = buf[0];
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
411 + mpeg2dec->fbuf[1]->buf[1] = buf[1];
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
412 + mpeg2dec->fbuf[1]->buf[2] = buf[2];
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
413 + mpeg2dec->fbuf[1]->id = NULL;
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
414 + }
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
415 }
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
416
32a214ee10e5 Restore hunk previously removed in r31354.
diego
parents: 31329
diff changeset
417 void mpeg2_custom_fbuf (mpeg2dec_t * mpeg2dec, int custom_fbuf)