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