Rev 1905 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1905 | Rev 3960 | ||
|---|---|---|---|
| Line 35... | Line 35... | ||
| 35 | 35 | ||
| 36 | enum optdec |
36 | enum optdec |
| 37 | { /* autodec needs to be =0 and the first, nodec needs to be the last -- for loops! */ |
37 | { /* autodec needs to be =0 and the first, nodec needs to be the last -- for loops! */ |
| 38 | autodec=0, generic, generic_dither, idrei, |
38 | autodec=0, generic, generic_dither, idrei, |
| 39 | ivier, ifuenf, ifuenf_dither, mmx, |
39 | ivier, ifuenf, ifuenf_dither, mmx, |
| 40 | dreidnow, dreidnowext, altivec, sse, x86_64, arm, |
40 | dreidnow, dreidnowext, altivec, sse, x86_64, arm, neon, |
| 41 | nodec |
41 | nodec |
| 42 | }; |
42 | }; |
| Line 43... | Line 43... | ||
| 43 | enum optcla { nocla=0, normal, mmxsse }; |
43 | enum optcla { nocla=0, normal, mmxsse }; |
| Line 65... | Line 65... | ||
| 65 | 65 | ||
| 66 | /* Safety catch for invalid decoder choice. */ |
66 | /* Safety catch for invalid decoder choice. */ |
| 67 | #ifdef REAL_IS_FIXED |
67 | #ifdef REAL_IS_FIXED |
| 68 | #if (defined OPT_I486) || (defined OPT_I586) || (defined OPT_I586_DITHER) \ |
68 | #if (defined OPT_I486) || (defined OPT_I586) || (defined OPT_I586_DITHER) \ |
| 69 | || (defined OPT_MMX) || (defined OPT_SSE) || (defined_OPT_ALTIVEC) \ |
69 | || (defined OPT_MMX) || (defined OPT_SSE) || (defined_OPT_ALTIVEC) \ |
| - | 70 | || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) || (defined OPT_X86_64) \ |
|
| 70 | || (defined OPT_3DNOW) || (defined OPT_3DNOWEXT) || (defined OPT_X86_64) || (defined OPT_GENERIC_DITHER) |
71 | || (defined OPT_NEON) || (defined OPT_GENERIC_DITHER) |
| 71 | #error "Bad decoder choice together with fixed point math!" |
72 | #error "Bad decoder choice together with fixed point math!" |
| 72 | #endif |
73 | #endif |
| Line 73... | Line 74... | ||
| 73 | #endif |
74 | #endif |
| Line 182... | Line 183... | ||
| 182 | #ifndef OPT_MULTI |
183 | #ifndef OPT_MULTI |
| 183 | # define defopt arm |
184 | # define defopt arm |
| 184 | #endif |
185 | #endif |
| 185 | #endif |
186 | #endif |
| Line -... | Line 187... | ||
| - | 187 | ||
| - | 188 | #ifdef OPT_NEON |
|
| - | 189 | #define OPT_MMXORSSE |
|
| - | 190 | #ifndef OPT_MULTI |
|
| - | 191 | # define defopt neon |
|
| - | 192 | #endif |
|
| - | 193 | #endif |
|
| 186 | 194 | ||
| 187 | /* used for multi opt mode and the single 3dnow mode to have the old 3dnow test flag still working */ |
195 | /* used for multi opt mode and the single 3dnow mode to have the old 3dnow test flag still working */ |
| Line 188... | Line 196... | ||
| 188 | void check_decoders(void); |
196 | void check_decoders(void); |
| 189 | 197 | ||
| Line 196... | Line 204... | ||
| 196 | #ifdef OPT_MULTI |
204 | #ifdef OPT_MULTI |
| Line 197... | Line 205... | ||
| 197 | 205 | ||
| Line 198... | Line 206... | ||
| 198 | # define defopt nodec |
206 | # define defopt nodec |
| 199 | 207 | ||
| 200 | # if (defined OPT_3DNOW || defined OPT_3DNOWEXT) |
208 | # if (defined OPT_3DNOW || defined OPT_3DNOWEXT) |
| Line 201... | Line 209... | ||
| 201 | # define opt_dct36(fr) ((fr)->cpu_opts.dct36) |
209 | # define opt_dct36(fr) ((fr)->cpu_opts.the_dct36) |
| Line 202... | Line 210... | ||
| 202 | # endif |
210 | # endif |