annotate libmpeg2/libmpeg-0.4.0.diff @ 19989:2f07e0e1693f

Lots of fixes by Jerome Ferrari
author gpoirier
date Wed, 27 Sep 2006 16:21:30 +0000
parents 7a9116ae7fc0
children c52bb8d6edea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
henry
parents: 13020
diff changeset
4 #ifdef ATTRIBUTE_ALIGNED_MAX
henry
parents: 13020
diff changeset
5 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
henry
parents: 13020
diff changeset
6 #else
henry
parents: 13020
diff changeset
7 -#define ATTR_ALIGN(align)
henry
parents: 13020
diff changeset
8 +#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((16 < align) ? 16 : align)))
henry
parents: 13020
diff changeset
9 #endif
henry
parents: 13020
diff changeset
10
henry
parents: 13020
diff changeset
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
de3edca9a962 Remove copyright notice changes from local diff.
diego
parents: 19024
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
23 #include "mpeg2_internal.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
24
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
25 #ifdef ACCEL_DETECT
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
26 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
35 static inline uint32_t arch_accel (void)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
43
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
59 }
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
60 -#endif /* ARCH_X86 */
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
61 +#endif /* ARCH_X86 || ARCH_X86_64 */
13020
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
62
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
63 -#if defined(ARCH_PPC) || defined(ARCH_SPARC)
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
64 +#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS))
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
65 #include <signal.h>
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
66 #include <setjmp.h>
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
67
19024
4733c3e4f353 Update with latest changes and make diff apply cleanly.
diego
parents: 18783
diff changeset
68 @@ -195,6 +222,7 @@
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
69 #ifdef ARCH_ALPHA
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
70 static inline uint32_t arch_accel (void)
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
71 {
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
72 +#ifdef CAN_COMPILE_ALPHA_MVI
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
73 uint64_t no_mvi;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
74
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
77 : "rI" (256)); /* AMASK_MVI */
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
78 return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA |
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
79 MPEG2_ACCEL_ALPHA_MVI);
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
80 +#else
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
81 + return MPEG2_ACCEL_ALPHA;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
82 +#endif
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
83 }
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
84 #endif /* ARCH_ALPHA */
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
87
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
88 accel = 0;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
89 #ifdef ACCEL_DETECT
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
90 -#if defined (ARCH_X86) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
91 +#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
92 accel = arch_accel ();
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
93 #endif
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
98 #include "mpeg2.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
99 #include "attributes.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
100 #include "mpeg2_internal.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
101 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
102 +#if defined(ARCH_X86) || defined(ARCH_X86_64)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
103 #include "mmx.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
104 #endif
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
105
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
106 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
107 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
108
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
109 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
110 +#if defined(ARCH_X86) || defined(ARCH_X86_64)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
111 static void state_restore_mmx (cpu_state_t * state)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
112 {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
113 emms ();
19024
4733c3e4f353 Update with latest changes and make diff apply cleanly.
diego
parents: 18783
diff changeset
114 @@ -115,12 +119,12 @@
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
115
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
116 void mpeg2_cpu_state_init (uint32_t accel)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
117 {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
118 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
119 +#if defined(ARCH_X86) || defined(ARCH_X86_64)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
120 if (accel & MPEG2_ACCEL_X86_MMX) {
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
121 mpeg2_cpu_state_restore = state_restore_mmx;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
122 }
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
123 #endif
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
124 -#ifdef ARCH_PPC
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
125 +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
126 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
127 mpeg2_cpu_state_save = state_save_altivec;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
132 fbuf->buf[1] = buf[1];
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
133 fbuf->buf[2] = buf[2];
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
134 fbuf->id = id;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
135 + // HACK! FIXME! At first I frame, copy pointers to prediction frame too!
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
136 + if (mpeg2dec->custom_fbuf && !mpeg2dec->fbuf[1]->buf[0]){
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
137 + mpeg2dec->fbuf[1]->buf[0]=buf[0];
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
138 + mpeg2dec->fbuf[1]->buf[1]=buf[1];
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
139 + mpeg2dec->fbuf[1]->buf[2]=buf[2];
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
140 + mpeg2dec->fbuf[1]->id=NULL;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
141 + }
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
142 +// printf("libmpeg2: FBUF 0:%p 1:%p 2:%p\n",
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
143 +// mpeg2dec->fbuf[0]->buf[0],mpeg2dec->fbuf[1]->buf[0],mpeg2dec->fbuf[2]->buf[0]);
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
144 }
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
145
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
150 mpeg2dec->decoder.convert = NULL;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
151 mpeg2dec->decoder.convert_id = NULL;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
152 mpeg2dec->picture = mpeg2dec->pictures;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
153 + memset(&mpeg2dec->fbuf_alloc[0].fbuf, 0, sizeof(mpeg2_fbuf_t));
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
154 + memset(&mpeg2dec->fbuf_alloc[1].fbuf, 0, sizeof(mpeg2_fbuf_t));
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
155 + memset(&mpeg2dec->fbuf_alloc[2].fbuf, 0, sizeof(mpeg2_fbuf_t));
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
156 mpeg2dec->fbuf[0] = &mpeg2dec->fbuf_alloc[0].fbuf;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
157 mpeg2dec->fbuf[1] = &mpeg2dec->fbuf_alloc[1].fbuf;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
160 if (!(mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE)) {
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
161 picture->nb_fields = (buffer[3] & 2) ? 3 : 2;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
162 flags |= (buffer[3] & 128) ? PIC_FLAG_TOP_FIELD_FIRST : 0;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
163 + flags |= (buffer[3] & 2) ? PIC_FLAG_REPEAT_FIRST_FIELD : 0;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
164 } else
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
165 picture->nb_fields = (buffer[3]&2) ? ((buffer[3]&128) ? 6 : 4) : 2;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
166 break;
19024
4733c3e4f353 Update with latest changes and make diff apply cleanly.
diego
parents: 18783
diff changeset
167 @@ -799,6 +807,7 @@
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
168 mpeg2dec->scaled[index] = mpeg2dec->q_scale_type;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
169 for (i = 0; i < 32; i++) {
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
170 k = mpeg2dec->q_scale_type ? non_linear_scale[i] : (i << 1);
13147
henry
parents: 13020
diff changeset
171 + decoder->quantizer_scales[i] = k;
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
172 for (j = 0; j < 64; j++)
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
173 decoder->quantizer_prescale[index][i][j] =
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
178 } while (0)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
179 #endif
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
180
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
181 -static void inline idct_row (int16_t * const block)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
182 +static inline void idct_row (int16_t * const block)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
183 {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
184 int d0, d1, d2, d3;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
187 block[7] = (a0 - b0) >> 12;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
188 }
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
189
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
190 -static void inline idct_col (int16_t * const block)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
191 +static inline void idct_col (int16_t * const block)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
192 {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
193 int d0, d1, d2, d3;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
194 int a0, a1, a2, a3, b0, b1, b2, b3;
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
195 @@ -239,12 +239,15 @@
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
196
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
197 void mpeg2_idct_init (uint32_t accel)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
198 {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
199 -#ifdef ARCH_X86
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
200 +#ifdef HAVE_MMX2
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
201 if (accel & MPEG2_ACCEL_X86_MMXEXT) {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
202 mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
203 mpeg2_idct_add = mpeg2_idct_add_mmxext;
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
204 mpeg2_idct_mmx_init ();
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
205 - } else if (accel & MPEG2_ACCEL_X86_MMX) {
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
206 + } else
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
207 +#endif
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
208 +#ifdef HAVE_MMX
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
209 + if (accel & MPEG2_ACCEL_X86_MMX) {
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
210 mpeg2_idct_copy = mpeg2_idct_copy_mmx;
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
211 mpeg2_idct_add = mpeg2_idct_add_mmx;
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
212 mpeg2_idct_mmx_init ();
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
213 @@ -254,11 +261,14 @@
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
214 } else
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
215 #endif
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
216 #ifdef ARCH_ALPHA
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
217 +#ifdef CAN_COMPILE_ALPHA_MVI
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
218 if (accel & MPEG2_ACCEL_ALPHA_MVI) {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
219 mpeg2_idct_copy = mpeg2_idct_copy_mvi;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
220 mpeg2_idct_add = mpeg2_idct_add_mvi;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
221 mpeg2_idct_alpha_init ();
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
222 - } else if (accel & MPEG2_ACCEL_ALPHA) {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
223 + } else
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
224 +#endif
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
225 + if (accel & MPEG2_ACCEL_ALPHA) {
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
226 int i;
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
227
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
268
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
269 #include "config.h"
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
270
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
271 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
272 +#if defined(ARCH_X86) || defined(ARCH_X86_64)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
273
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
274 #include <inttypes.h>
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
278 @@ -37,16 +37,22 @@
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
279
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
280 void mpeg2_mc_init (uint32_t accel)
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
281 {
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
282 -#ifdef ARCH_X86
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
283 +#ifdef HAVE_MMX2
13864
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
284 if (accel & MPEG2_ACCEL_X86_MMXEXT)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
285 mpeg2_mc = mpeg2_mc_mmxext;
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
286 - else if (accel & MPEG2_ACCEL_X86_3DNOW)
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
287 + else
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
288 +#endif
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
289 +#ifdef HAVE_3DNOW
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
290 + if (accel & MPEG2_ACCEL_X86_3DNOW)
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
291 mpeg2_mc = mpeg2_mc_3dnow;
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
292 - else if (accel & MPEG2_ACCEL_X86_MMX)
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
293 + else
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
294 +#endif
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
295 +#ifdef HAVE_MMX
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
296 + if (accel & MPEG2_ACCEL_X86_MMX)
14730
4d64117768b1 Update patch with missing changes.
diego
parents: 13864
diff changeset
297 mpeg2_mc = mpeg2_mc_mmx;
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
298 - elseo
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
299 + else
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
300 #endif
14730
4d64117768b1 Update patch with missing changes.
diego
parents: 13864
diff changeset
301 -#ifdef ARCH_PPC
4d64117768b1 Update patch with missing changes.
diego
parents: 13864
diff changeset
302 +#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
303 if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
304 mpeg2_mc = mpeg2_mc_altivec;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
305 else
19259
7a9116ae7fc0 Update for changes from r19139 and r19137.
diego
parents: 19026
diff changeset
306 @@ -52,7 +62,7 @@
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
307 mpeg2_mc = mpeg2_mc_alpha;
13020
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
308 else
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
309 #endif
14730
4d64117768b1 Update patch with missing changes.
diego
parents: 13864
diff changeset
310 -#ifdef ARCH_SPARC
4d64117768b1 Update patch with missing changes.
diego
parents: 13864
diff changeset
311 +#if defined(ARCH_SPARC) && defined(HAVE_VIS)
13020
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
312 if (accel & MPEG2_ACCEL_SPARC_VIS)
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
313 mpeg2_mc = mpeg2_mc_vis;
3380d4a65b15 Patch updated for latest changes to libmpeg2.
diego
parents: 13019
diff changeset
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
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
318
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
319 #include "config.h"
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
320
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
321 -#ifdef ARCH_X86
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
322 +#if defined(ARCH_X86) || defined(ARCH_X86_64)
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
323
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
324 #include <inttypes.h>
96259a2f2142 enable mmx support on x86_64 in libmpeg2
aurel
parents: 13147
diff changeset
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
henry
parents: 13020
diff changeset
329 #define PIC_FLAG_COMPOSITE_DISPLAY 32
henry
parents: 13020
diff changeset
330 #define PIC_FLAG_SKIP 64
henry
parents: 13020
diff changeset
331 #define PIC_FLAG_TAGS 128
henry
parents: 13020
diff changeset
332 +#define PIC_FLAG_REPEAT_FIRST_FIELD 256
henry
parents: 13020
diff changeset
333 #define PIC_MASK_COMPOSITE_DISPLAY 0xfffff000
henry
parents: 13020
diff changeset
334
henry
parents: 13020
diff changeset
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
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
347 int second_field;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
348
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
349 int mpeg1;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
350 +
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
351 + /* for MPlayer: */
13147
henry
parents: 13020
diff changeset
352 + int quantizer_scales[32];
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
353 + int quantizer_scale;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
354 + char* quant_store;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
355 + int quant_stride;
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
356 };
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
357
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
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
henry
parents: 13020
diff changeset
360 int8_t q_scale_type, scaled[4];
henry
parents: 13020
diff changeset
361 uint8_t quantizer_matrix[4][64];
henry
parents: 13020
diff changeset
362 uint8_t new_quantizer_matrix[4][64];
henry
parents: 13020
diff changeset
363 +
henry
parents: 13020
diff changeset
364 + /* for MPlayer: */
henry
parents: 13020
diff changeset
365 + unsigned char *pending_buffer;
henry
parents: 13020
diff changeset
366 + int pending_length;
henry
parents: 13020
diff changeset
367 };
henry
parents: 13020
diff changeset
368
henry
parents: 13020
diff changeset
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
henry
parents: 13020
diff changeset
373
henry
parents: 13020
diff changeset
374 quantizer_scale_code = UBITS (bit_buf, 5);
henry
parents: 13020
diff changeset
375 DUMPBITS (bit_buf, bits, 5);
henry
parents: 13020
diff changeset
376 + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code];
henry
parents: 13020
diff changeset
377
henry
parents: 13020
diff changeset
378 decoder->quantizer_matrix[0] =
henry
parents: 13020
diff changeset
379 decoder->quantizer_prescale[0][quantizer_scale_code];
19024
4733c3e4f353 Update with latest changes and make diff apply cleanly.
diego
parents: 18783
diff changeset
380 @@ -1564,6 +1569,9 @@
12937
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
381
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
382 #define NEXT_MACROBLOCK \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
383 do { \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
384 + if(decoder->quant_store) \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
385 + decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
386 + +(decoder->offset>>4)] = decoder->quantizer_scale; \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
387 decoder->offset += 16; \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
388 if (decoder->offset == decoder->width) { \
b61f21a54546 summary of the MPlayer specific libmpeg2 changes
henry
parents:
diff changeset
389 do { /* just so we can use the break statement */ \