Mercurial > mplayer.hg
annotate libmpeg2/libmpeg-0.4.0.diff @ 21377:6053051bdc75
add missing r15484
author | henry |
---|---|
date | Wed, 29 Nov 2006 20:46:27 +0000 |
parents | c52bb8d6edea |
children | 8c43ea1ea79a |
rev | line source |
---|---|
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
1 --- include/attributes.h 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
2 +++ libmpeg2/attributes.h 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
3 @@ -25,7 +29,7 @@ |
13147 | 4 #ifdef ATTRIBUTE_ALIGNED_MAX |
5 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) | |
6 #else | |
7 -#define ATTR_ALIGN(align) | |
8 +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((16 < align) ? 16 : align))) | |
9 #endif | |
10 | |
11 #ifdef HAVE_BUILTIN_EXPECT | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
12 --- libmpeg2/cpu_accel.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
13 +++ libmpeg2/cpu_accel.c 2006-06-16 20:12:50.000000000 +0200 |
19026 | 14 @@ -22,6 +26,7 @@ |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
15 */ |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
16 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
17 #include "config.h" |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
18 +#include "cpudetect.h" |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
19 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
20 #include <inttypes.h> |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
21 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
22 @@ -30,9 +35,17 @@ |
13864 | 23 #include "mpeg2_internal.h" |
24 | |
25 #ifdef ACCEL_DETECT | |
26 -#ifdef ARCH_X86 | |
27 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
28 + |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
29 +/* MPlayer imports libmpeg2 as decoder, which detects MMX / 3DNow! |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
30 + * instructions via assembly. However, it is regarded as duplicaed work |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
31 + * in MPlayer, so that we enforce to use MPlayer's implementation. |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
32 + */ |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
33 +#define USE_MPLAYER_CPUDETECT |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
34 + |
13864 | 35 static inline uint32_t arch_accel (void) |
36 { | |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
37 +#if !defined(USE_MPLAYER_CPUDETECT) |
13864 | 38 uint32_t eax, ebx, ecx, edx; |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
39 int AMD; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
40 uint32_t caps; |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
41 @@ -105,10 +118,24 @@ |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
42 caps |= MPEG2_ACCEL_X86_MMXEXT; |
13864 | 43 |
44 return caps; | |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
45 +#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's cpu capability property */ |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
46 + caps = 0; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
47 + if (gCpuCaps.hasMMX) |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
48 + caps |= MPEG2_ACCEL_X86_MMX; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
49 + if (gCpuCaps.hasSSE2) |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
50 + caps |= MPEG2_ACCEL_X86_SSE2; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
51 + if (gCpuCaps.hasMMX2) |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
52 + caps |= MPEG2_ACCEL_X86_MMXEXT; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
53 + if (gCpuCaps.has3DNow) |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
54 + caps |= MPEG2_ACCEL_X86_3DNOW; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
55 + |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
56 + return caps; |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
57 + |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
58 +#endif /* USE_MPLAYER_CPUDETECT */ |
13020 | 59 } |
13864 | 60 -#endif /* ARCH_X86 */ |
61 +#endif /* ARCH_X86 || ARCH_X86_64 */ | |
13020 | 62 |
63 -#if defined(ARCH_PPC) || defined(ARCH_SPARC) | |
64 +#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS)) | |
65 #include <signal.h> | |
66 #include <setjmp.h> | |
67 | |
21377 | 68 @@ -166,10 +166,10 @@ |
69 | |
70 canjump = 1; | |
71 | |
72 -#ifdef HAVE_ALTIVEC_H /* gnu */ | |
73 -#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" | |
74 -#else /* apple */ | |
75 +#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ | |
76 #define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t" | |
77 +#else /* gnu */ | |
78 +#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" | |
79 #endif | |
80 asm volatile ("mtspr 256, %0\n\t" | |
81 VAND (0, 0, 0) | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
82 @@ -195,6 +222,7 @@ |
12937 | 83 #ifdef ARCH_ALPHA |
84 static inline uint32_t arch_accel (void) | |
85 { | |
86 +#ifdef CAN_COMPILE_ALPHA_MVI | |
87 uint64_t no_mvi; | |
88 | |
89 asm volatile ("amask %1, %0" | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
90 @@ -202,6 +230,9 @@ |
12937 | 91 : "rI" (256)); /* AMASK_MVI */ |
92 return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA | | |
93 MPEG2_ACCEL_ALPHA_MVI); | |
94 +#else | |
95 + return MPEG2_ACCEL_ALPHA; | |
96 +#endif | |
97 } | |
98 #endif /* ARCH_ALPHA */ | |
99 #endif /* ACCEL_DETECT */ | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
100 @@ -212,7 +243,7 @@ |
13864 | 101 |
102 accel = 0; | |
103 #ifdef ACCEL_DETECT | |
104 -#if defined (ARCH_X86) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC) | |
105 +#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC) | |
106 accel = arch_accel (); | |
107 #endif | |
108 #endif | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
109 --- libmpeg2/cpu_state.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
110 +++ libmpeg2/cpu_state.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
111 @@ -29,14 +33,14 @@ |
13864 | 112 #include "mpeg2.h" |
113 #include "attributes.h" | |
114 #include "mpeg2_internal.h" | |
115 -#ifdef ARCH_X86 | |
116 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
117 #include "mmx.h" | |
118 #endif | |
119 | |
120 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL; | |
121 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL; | |
122 | |
123 -#ifdef ARCH_X86 | |
124 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
125 static void state_restore_mmx (cpu_state_t * state) | |
126 { | |
127 emms (); | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
128 @@ -115,12 +119,12 @@ |
13864 | 129 |
130 void mpeg2_cpu_state_init (uint32_t accel) | |
131 { | |
132 -#ifdef ARCH_X86 | |
133 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
134 if (accel & MPEG2_ACCEL_X86_MMX) { | |
12937 | 135 mpeg2_cpu_state_restore = state_restore_mmx; |
136 } | |
137 #endif | |
138 -#ifdef ARCH_PPC | |
139 +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) | |
140 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { | |
141 mpeg2_cpu_state_save = state_save_altivec; | |
142 mpeg2_cpu_state_restore = state_restore_altivec; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
143 --- libmpeg2/decode.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
144 +++ libmpeg2/decode.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
145 @@ -351,6 +355,15 @@ |
12937 | 146 fbuf->buf[1] = buf[1]; |
147 fbuf->buf[2] = buf[2]; | |
148 fbuf->id = id; | |
149 + // HACK! FIXME! At first I frame, copy pointers to prediction frame too! | |
150 + if (mpeg2dec->custom_fbuf && !mpeg2dec->fbuf[1]->buf[0]){ | |
151 + mpeg2dec->fbuf[1]->buf[0]=buf[0]; | |
152 + mpeg2dec->fbuf[1]->buf[1]=buf[1]; | |
153 + mpeg2dec->fbuf[1]->buf[2]=buf[2]; | |
154 + mpeg2dec->fbuf[1]->id=NULL; | |
155 + } | |
156 +// printf("libmpeg2: FBUF 0:%p 1:%p 2:%p\n", | |
157 +// mpeg2dec->fbuf[0]->buf[0],mpeg2dec->fbuf[1]->buf[0],mpeg2dec->fbuf[2]->buf[0]); | |
158 } | |
159 | |
160 void mpeg2_custom_fbuf (mpeg2dec_t * mpeg2dec, int custom_fbuf) | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
161 --- libmpeg2/header.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
162 +++ libmpeg2/header.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
163 @@ -100,6 +104,9 @@ |
12937 | 164 mpeg2dec->decoder.convert = NULL; |
165 mpeg2dec->decoder.convert_id = NULL; | |
166 mpeg2dec->picture = mpeg2dec->pictures; | |
167 + memset(&mpeg2dec->fbuf_alloc[0].fbuf, 0, sizeof(mpeg2_fbuf_t)); | |
168 + memset(&mpeg2dec->fbuf_alloc[1].fbuf, 0, sizeof(mpeg2_fbuf_t)); | |
169 + memset(&mpeg2dec->fbuf_alloc[2].fbuf, 0, sizeof(mpeg2_fbuf_t)); | |
170 mpeg2dec->fbuf[0] = &mpeg2dec->fbuf_alloc[0].fbuf; | |
171 mpeg2dec->fbuf[1] = &mpeg2dec->fbuf_alloc[1].fbuf; | |
172 mpeg2dec->fbuf[2] = &mpeg2dec->fbuf_alloc[2].fbuf; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
173 @@ -551,6 +558,7 @@ |
12937 | 174 if (!(mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE)) { |
175 picture->nb_fields = (buffer[3] & 2) ? 3 : 2; | |
176 flags |= (buffer[3] & 128) ? PIC_FLAG_TOP_FIELD_FIRST : 0; | |
177 + flags |= (buffer[3] & 2) ? PIC_FLAG_REPEAT_FIRST_FIELD : 0; | |
178 } else | |
179 picture->nb_fields = (buffer[3]&2) ? ((buffer[3]&128) ? 6 : 4) : 2; | |
180 break; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
181 @@ -799,6 +807,7 @@ |
12937 | 182 mpeg2dec->scaled[index] = mpeg2dec->q_scale_type; |
183 for (i = 0; i < 32; i++) { | |
184 k = mpeg2dec->q_scale_type ? non_linear_scale[i] : (i << 1); | |
13147 | 185 + decoder->quantizer_scales[i] = k; |
12937 | 186 for (j = 0; j < 64; j++) |
187 decoder->quantizer_prescale[index][i][j] = | |
188 k * mpeg2dec->quantizer_matrix[index][j]; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
189 --- libmpeg2/idct.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
190 +++ libmpeg2/idct.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
191 @@ -66,7 +70,7 @@ |
13864 | 192 } while (0) |
193 #endif | |
194 | |
195 -static void inline idct_row (int16_t * const block) | |
196 +static inline void idct_row (int16_t * const block) | |
197 { | |
198 int d0, d1, d2, d3; | |
199 int a0, a1, a2, a3, b0, b1, b2, b3; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
200 @@ -119,7 +123,7 @@ |
13864 | 201 block[7] = (a0 - b0) >> 12; |
202 } | |
203 | |
204 -static void inline idct_col (int16_t * const block) | |
205 +static inline void idct_col (int16_t * const block) | |
206 { | |
207 int d0, d1, d2, d3; | |
208 int a0, a1, a2, a3, b0, b1, b2, b3; | |
19259 | 209 @@ -239,12 +239,15 @@ |
13864 | 210 |
211 void mpeg2_idct_init (uint32_t accel) | |
212 { | |
213 -#ifdef ARCH_X86 | |
19259 | 214 +#ifdef HAVE_MMX2 |
13864 | 215 if (accel & MPEG2_ACCEL_X86_MMXEXT) { |
216 mpeg2_idct_copy = mpeg2_idct_copy_mmxext; | |
217 mpeg2_idct_add = mpeg2_idct_add_mmxext; | |
19259 | 218 mpeg2_idct_mmx_init (); |
219 - } else if (accel & MPEG2_ACCEL_X86_MMX) { | |
220 + } else | |
221 +#endif | |
222 +#ifdef HAVE_MMX | |
223 + if (accel & MPEG2_ACCEL_X86_MMX) { | |
224 mpeg2_idct_copy = mpeg2_idct_copy_mmx; | |
225 mpeg2_idct_add = mpeg2_idct_add_mmx; | |
226 mpeg2_idct_mmx_init (); | |
227 @@ -254,11 +261,14 @@ | |
13864 | 228 } else |
229 #endif | |
230 #ifdef ARCH_ALPHA | |
231 +#ifdef CAN_COMPILE_ALPHA_MVI | |
232 if (accel & MPEG2_ACCEL_ALPHA_MVI) { | |
233 mpeg2_idct_copy = mpeg2_idct_copy_mvi; | |
234 mpeg2_idct_add = mpeg2_idct_add_mvi; | |
235 mpeg2_idct_alpha_init (); | |
236 - } else if (accel & MPEG2_ACCEL_ALPHA) { | |
237 + } else | |
238 +#endif | |
239 + if (accel & MPEG2_ACCEL_ALPHA) { | |
240 int i; | |
241 | |
242 mpeg2_idct_copy = mpeg2_idct_copy_alpha; | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
243 --- libmpeg2/idct_alpha.c 2006-06-16 20:12:26.000000000 +0200 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
244 +++ libmpeg2/idct_alpha.c 2006-06-16 20:12:50.000000000 +0200 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
245 @@ -59,7 +63,7 @@ |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
246 } while (0) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
247 #endif |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
248 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
249 -static void inline idct_row (int16_t * const block) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
250 +static inline void idct_row (int16_t * const block) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
251 { |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
252 uint64_t l, r; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
253 int_fast32_t d0, d1, d2, d3; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
254 @@ -116,7 +120,7 @@ |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
255 block[7] = (a0 - b0) >> 12; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
256 } |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
257 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
258 -static void inline idct_col (int16_t * const block) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
259 +static inline void idct_col (int16_t * const block) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
260 { |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
261 int_fast32_t d0, d1, d2, d3; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
262 int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
263 @@ -157,6 +161,7 @@ |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
264 block[8*7] = (a0 - b0) >> 17; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
265 } |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
266 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
267 +#ifdef CAN_COMPILE_ALPHA_MVI |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
268 void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
269 { |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
270 uint64_t clampmask; |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
271 @@ -289,6 +294,7 @@ |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
272 stq (p7, dest + 7 * stride); |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
273 } |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
274 } |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
275 +#endif |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
276 |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
277 void mpeg2_idct_copy_alpha (int16_t * block, uint8_t * dest, const int stride) |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
278 { |
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
279 --- libmpeg2/idct_mmx.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
280 +++ libmpeg2/idct_mmx.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
281 @@ -23,7 +27,7 @@ |
13864 | 282 |
283 #include "config.h" | |
12937 | 284 |
13864 | 285 -#ifdef ARCH_X86 |
286 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
287 | |
288 #include <inttypes.h> | |
12937 | 289 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
290 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
291 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200 |
19259 | 292 @@ -37,16 +37,22 @@ |
13864 | 293 |
294 void mpeg2_mc_init (uint32_t accel) | |
12937 | 295 { |
13864 | 296 -#ifdef ARCH_X86 |
19259 | 297 +#ifdef HAVE_MMX2 |
13864 | 298 if (accel & MPEG2_ACCEL_X86_MMXEXT) |
299 mpeg2_mc = mpeg2_mc_mmxext; | |
19259 | 300 - else if (accel & MPEG2_ACCEL_X86_3DNOW) |
301 + else | |
302 +#endif | |
303 +#ifdef HAVE_3DNOW | |
304 + if (accel & MPEG2_ACCEL_X86_3DNOW) | |
305 mpeg2_mc = mpeg2_mc_3dnow; | |
306 - else if (accel & MPEG2_ACCEL_X86_MMX) | |
307 + else | |
308 +#endif | |
309 +#ifdef HAVE_MMX | |
310 + if (accel & MPEG2_ACCEL_X86_MMX) | |
14730 | 311 mpeg2_mc = mpeg2_mc_mmx; |
19259 | 312 - elseo |
313 + else | |
12937 | 314 #endif |
14730 | 315 -#ifdef ARCH_PPC |
316 +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) | |
12937 | 317 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) |
318 mpeg2_mc = mpeg2_mc_altivec; | |
319 else | |
19259 | 320 @@ -52,7 +62,7 @@ |
12937 | 321 mpeg2_mc = mpeg2_mc_alpha; |
13020 | 322 else |
323 #endif | |
14730 | 324 -#ifdef ARCH_SPARC |
325 +#if defined(ARCH_SPARC) && defined(HAVE_VIS) | |
13020 | 326 if (accel & MPEG2_ACCEL_SPARC_VIS) |
327 mpeg2_mc = mpeg2_mc_vis; | |
328 else | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
329 --- libmpeg2/motion_comp_mmx.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
330 +++ libmpeg2/motion_comp_mmx.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
331 @@ -23,7 +27,7 @@ |
13864 | 332 |
333 #include "config.h" | |
334 | |
335 -#ifdef ARCH_X86 | |
336 +#if defined(ARCH_X86) || defined(ARCH_X86_64) | |
337 | |
338 #include <inttypes.h> | |
339 | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
340 --- include/mpeg2.h 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
341 +++ libmpeg2/mpeg2.h 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
342 @@ -82,6 +86,7 @@ |
13147 | 343 #define PIC_FLAG_COMPOSITE_DISPLAY 32 |
344 #define PIC_FLAG_SKIP 64 | |
345 #define PIC_FLAG_TAGS 128 | |
346 +#define PIC_FLAG_REPEAT_FIRST_FIELD 256 | |
347 #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000 | |
348 | |
349 typedef struct mpeg2_picture_s { | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
350 @@ -154,6 +159,7 @@ |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
351 #define MPEG2_ACCEL_X86_MMX 1 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
352 #define MPEG2_ACCEL_X86_3DNOW 2 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
353 #define MPEG2_ACCEL_X86_MMXEXT 4 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
354 +#define MPEG2_ACCEL_X86_SSE2 8 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
355 #define MPEG2_ACCEL_PPC_ALTIVEC 1 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
356 #define MPEG2_ACCEL_ALPHA 1 |
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
357 #define MPEG2_ACCEL_ALPHA_MVI 2 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
358 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
359 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
360 @@ -144,6 +148,12 @@ |
12937 | 361 int second_field; |
362 | |
363 int mpeg1; | |
364 + | |
365 + /* for MPlayer: */ | |
13147 | 366 + int quantizer_scales[32]; |
12937 | 367 + int quantizer_scale; |
368 + char* quant_store; | |
369 + int quant_stride; | |
370 }; | |
371 | |
372 typedef struct { | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
373 @@ -214,6 +224,10 @@ |
13147 | 374 int8_t q_scale_type, scaled[4]; |
375 uint8_t quantizer_matrix[4][64]; | |
376 uint8_t new_quantizer_matrix[4][64]; | |
377 + | |
378 + /* for MPlayer: */ | |
379 + unsigned char *pending_buffer; | |
380 + int pending_length; | |
381 }; | |
382 | |
383 typedef struct { | |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
384 --- libmpeg2/slice.c 2006-06-16 20:12:26.000000000 +0200 |
18730
93241711b635
sync with 18730 (Use MPlayer's CPU detection module instead of libmpeg2's)
gpoirier
parents:
14730
diff
changeset
|
385 +++ libmpeg2/slice.c 2006-06-16 20:12:50.000000000 +0200 |
19024
4733c3e4f353
Update with latest changes and make diff apply cleanly.
diego
parents:
18783
diff
changeset
|
386 @@ -142,6 +146,7 @@ |
13147 | 387 |
388 quantizer_scale_code = UBITS (bit_buf, 5); | |
389 DUMPBITS (bit_buf, bits, 5); | |
390 + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code]; | |
391 | |
392 decoder->quantizer_matrix[0] = | |
393 decoder->quantizer_prescale[0][quantizer_scale_code]; | |
20640 | 394 @@ -1568,6 +1569,18 @@ |
12937 | 395 |
396 #define NEXT_MACROBLOCK \ | |
397 do { \ | |
20640 | 398 + if(decoder->quant_store) { \ |
399 + if (decoder->picture_structure == TOP_FIELD) \ | |
400 + decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \ | |
401 + +(decoder->offset>>4)] = decoder->quantizer_scale; \ | |
402 + else if (decoder->picture_structure == BOTTOM_FIELD) \ | |
403 + decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \ | |
404 + + decoder->quant_stride \ | |
405 + +(decoder->offset>>4)] = decoder->quantizer_scale; \ | |
406 + else \ | |
12937 | 407 + decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \ |
408 + +(decoder->offset>>4)] = decoder->quantizer_scale; \ | |
20640 | 409 + } \ |
12937 | 410 decoder->offset += 16; \ |
411 if (decoder->offset == decoder->width) { \ | |
412 do { /* just so we can use the break statement */ \ |