Mercurial > mplayer.hg
comparison libvo/osd.c @ 20577:6289755ce7c7
ARCH_X86 simplifications
author | reimar |
---|---|
date | Wed, 01 Nov 2006 18:41:25 +0000 |
parents | 843e0427b5b9 |
children | 7a1397677cb3 |
comparison
equal
deleted
inserted
replaced
20576:9e7c80f126d6 | 20577:6289755ce7c7 |
---|---|
10 #include "mp_msg.h" | 10 #include "mp_msg.h" |
11 #include <inttypes.h> | 11 #include <inttypes.h> |
12 #include "cpudetect.h" | 12 #include "cpudetect.h" |
13 #include "mangle.h" | 13 #include "mangle.h" |
14 | 14 |
15 #if defined(ARCH_X86) || defined(ARCH_X86_64) | 15 #ifdef ARCH_X86 |
16 #define CAN_COMPILE_X86_ASM | 16 #define CAN_COMPILE_X86_ASM |
17 #endif | 17 #endif |
18 | 18 |
19 #ifdef CAN_COMPILE_X86_ASM | 19 #ifdef CAN_COMPILE_X86_ASM |
20 static const uint64_t bFF attribute_used __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; | 20 static const uint64_t bFF attribute_used __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; |
121 vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride); | 121 vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride); |
122 #elif defined (HAVE_3DNOW) | 122 #elif defined (HAVE_3DNOW) |
123 vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride); | 123 vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride); |
124 #elif defined (HAVE_MMX) | 124 #elif defined (HAVE_MMX) |
125 vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride); | 125 vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride); |
126 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 126 #elif defined(ARCH_X86) |
127 vo_draw_alpha_yv12_X86(w, h, src, srca, srcstride, dstbase, dststride); | 127 vo_draw_alpha_yv12_X86(w, h, src, srca, srcstride, dstbase, dststride); |
128 #else | 128 #else |
129 vo_draw_alpha_yv12_C(w, h, src, srca, srcstride, dstbase, dststride); | 129 vo_draw_alpha_yv12_C(w, h, src, srca, srcstride, dstbase, dststride); |
130 #endif | 130 #endif |
131 #endif //!RUNTIME_CPUDETECT | 131 #endif //!RUNTIME_CPUDETECT |
151 vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride); | 151 vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride); |
152 #elif defined (HAVE_3DNOW) | 152 #elif defined (HAVE_3DNOW) |
153 vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride); | 153 vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride); |
154 #elif defined (HAVE_MMX) | 154 #elif defined (HAVE_MMX) |
155 vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride); | 155 vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride); |
156 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 156 #elif defined(ARCH_X86) |
157 vo_draw_alpha_yuy2_X86(w, h, src, srca, srcstride, dstbase, dststride); | 157 vo_draw_alpha_yuy2_X86(w, h, src, srca, srcstride, dstbase, dststride); |
158 #else | 158 #else |
159 vo_draw_alpha_yuy2_C(w, h, src, srca, srcstride, dstbase, dststride); | 159 vo_draw_alpha_yuy2_C(w, h, src, srca, srcstride, dstbase, dststride); |
160 #endif | 160 #endif |
161 #endif //!RUNTIME_CPUDETECT | 161 #endif //!RUNTIME_CPUDETECT |
181 vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride); | 181 vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride); |
182 #elif defined (HAVE_3DNOW) | 182 #elif defined (HAVE_3DNOW) |
183 vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride); | 183 vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride); |
184 #elif defined (HAVE_MMX) | 184 #elif defined (HAVE_MMX) |
185 vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride); | 185 vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride); |
186 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 186 #elif defined(ARCH_X86) |
187 vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride); | 187 vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride); |
188 #else | 188 #else |
189 vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride); | 189 vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride); |
190 #endif | 190 #endif |
191 #endif //!RUNTIME_CPUDETECT | 191 #endif //!RUNTIME_CPUDETECT |
211 vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride); | 211 vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride); |
212 #elif defined (HAVE_3DNOW) | 212 #elif defined (HAVE_3DNOW) |
213 vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride); | 213 vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride); |
214 #elif defined (HAVE_MMX) | 214 #elif defined (HAVE_MMX) |
215 vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride); | 215 vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride); |
216 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 216 #elif defined(ARCH_X86) |
217 vo_draw_alpha_rgb24_X86(w, h, src, srca, srcstride, dstbase, dststride); | 217 vo_draw_alpha_rgb24_X86(w, h, src, srca, srcstride, dstbase, dststride); |
218 #else | 218 #else |
219 vo_draw_alpha_rgb24_C(w, h, src, srca, srcstride, dstbase, dststride); | 219 vo_draw_alpha_rgb24_C(w, h, src, srca, srcstride, dstbase, dststride); |
220 #endif | 220 #endif |
221 #endif //!RUNTIME_CPUDETECT | 221 #endif //!RUNTIME_CPUDETECT |
241 vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride); | 241 vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride); |
242 #elif defined (HAVE_3DNOW) | 242 #elif defined (HAVE_3DNOW) |
243 vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride); | 243 vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride); |
244 #elif defined (HAVE_MMX) | 244 #elif defined (HAVE_MMX) |
245 vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride); | 245 vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride); |
246 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 246 #elif defined(ARCH_X86) |
247 vo_draw_alpha_rgb32_X86(w, h, src, srca, srcstride, dstbase, dststride); | 247 vo_draw_alpha_rgb32_X86(w, h, src, srca, srcstride, dstbase, dststride); |
248 #else | 248 #else |
249 vo_draw_alpha_rgb32_C(w, h, src, srca, srcstride, dstbase, dststride); | 249 vo_draw_alpha_rgb32_C(w, h, src, srca, srcstride, dstbase, dststride); |
250 #endif | 250 #endif |
251 #endif //!RUNTIME_CPUDETECT | 251 #endif //!RUNTIME_CPUDETECT |
286 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); | 286 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); |
287 #elif defined (HAVE_3DNOW) | 287 #elif defined (HAVE_3DNOW) |
288 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n"); | 288 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n"); |
289 #elif defined (HAVE_MMX) | 289 #elif defined (HAVE_MMX) |
290 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n"); | 290 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n"); |
291 #elif defined(ARCH_X86) || defined(ARCH_X86_64) | 291 #elif defined(ARCH_X86) |
292 mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n"); | 292 mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n"); |
293 #else | 293 #else |
294 mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n"); | 294 mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n"); |
295 #endif | 295 #endif |
296 #endif //!RUNTIME_CPUDETECT | 296 #endif //!RUNTIME_CPUDETECT |