Mercurial > mplayer.hg
comparison libswscale/swscale.c @ 29608:ff34398b14b1
Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
Patch by Lars T¸«£uber <lars <dot> taeuber <at> gmx <dot> net>.
author | ramiro |
---|---|
date | Sat, 05 Sep 2009 23:33:11 +0000 |
parents | 647fc86d3463 |
children | 9b0c934c78b5 |
comparison
equal
deleted
inserted
replaced
29607:5a46b1a05a32 | 29608:ff34398b14b1 |
---|---|
134 || (x)==PIX_FMT_BGR4_BYTE \ | 134 || (x)==PIX_FMT_BGR4_BYTE \ |
135 || (x)==PIX_FMT_RGB4_BYTE \ | 135 || (x)==PIX_FMT_RGB4_BYTE \ |
136 || (x)==PIX_FMT_YUV440P \ | 136 || (x)==PIX_FMT_YUV440P \ |
137 || (x)==PIX_FMT_MONOWHITE \ | 137 || (x)==PIX_FMT_MONOWHITE \ |
138 || (x)==PIX_FMT_MONOBLACK \ | 138 || (x)==PIX_FMT_MONOBLACK \ |
139 || (x)==PIX_FMT_YUV420PLE \ | 139 || (x)==PIX_FMT_YUV420P16LE \ |
140 || (x)==PIX_FMT_YUV422PLE \ | 140 || (x)==PIX_FMT_YUV422P16LE \ |
141 || (x)==PIX_FMT_YUV444PLE \ | 141 || (x)==PIX_FMT_YUV444P16LE \ |
142 || (x)==PIX_FMT_YUV420PBE \ | 142 || (x)==PIX_FMT_YUV420P16BE \ |
143 || (x)==PIX_FMT_YUV422PBE \ | 143 || (x)==PIX_FMT_YUV422P16BE \ |
144 || (x)==PIX_FMT_YUV444PBE \ | 144 || (x)==PIX_FMT_YUV444P16BE \ |
145 ) | 145 ) |
146 #define isSupportedOut(x) ( \ | 146 #define isSupportedOut(x) ( \ |
147 (x)==PIX_FMT_YUV420P \ | 147 (x)==PIX_FMT_YUV420P \ |
148 || (x)==PIX_FMT_YUVA420P \ | 148 || (x)==PIX_FMT_YUVA420P \ |
149 || (x)==PIX_FMT_YUYV422 \ | 149 || (x)==PIX_FMT_YUYV422 \ |
158 || (x)==PIX_FMT_GRAY16BE \ | 158 || (x)==PIX_FMT_GRAY16BE \ |
159 || (x)==PIX_FMT_GRAY16LE \ | 159 || (x)==PIX_FMT_GRAY16LE \ |
160 || (x)==PIX_FMT_GRAY8 \ | 160 || (x)==PIX_FMT_GRAY8 \ |
161 || (x)==PIX_FMT_YUV410P \ | 161 || (x)==PIX_FMT_YUV410P \ |
162 || (x)==PIX_FMT_YUV440P \ | 162 || (x)==PIX_FMT_YUV440P \ |
163 || (x)==PIX_FMT_YUV420PLE \ | 163 || (x)==PIX_FMT_YUV420P16LE \ |
164 || (x)==PIX_FMT_YUV422PLE \ | 164 || (x)==PIX_FMT_YUV422P16LE \ |
165 || (x)==PIX_FMT_YUV444PLE \ | 165 || (x)==PIX_FMT_YUV444P16LE \ |
166 || (x)==PIX_FMT_YUV420PBE \ | 166 || (x)==PIX_FMT_YUV420P16BE \ |
167 || (x)==PIX_FMT_YUV422PBE \ | 167 || (x)==PIX_FMT_YUV422P16BE \ |
168 || (x)==PIX_FMT_YUV444PBE \ | 168 || (x)==PIX_FMT_YUV444P16BE \ |
169 ) | 169 ) |
170 #define isPacked(x) ( \ | 170 #define isPacked(x) ( \ |
171 (x)==PIX_FMT_PAL8 \ | 171 (x)==PIX_FMT_PAL8 \ |
172 || (x)==PIX_FMT_YUYV422 \ | 172 || (x)==PIX_FMT_YUYV422 \ |
173 || (x)==PIX_FMT_UYVY422 \ | 173 || (x)==PIX_FMT_UYVY422 \ |
457 return "vdpau_mpeg2"; | 457 return "vdpau_mpeg2"; |
458 case PIX_FMT_VDPAU_WMV3: | 458 case PIX_FMT_VDPAU_WMV3: |
459 return "vdpau_wmv3"; | 459 return "vdpau_wmv3"; |
460 case PIX_FMT_VDPAU_VC1: | 460 case PIX_FMT_VDPAU_VC1: |
461 return "vdpau_vc1"; | 461 return "vdpau_vc1"; |
462 case PIX_FMT_YUV420PLE: | 462 case PIX_FMT_YUV420P16LE: |
463 return "yuv420ple"; | 463 return "yuv420p16le"; |
464 case PIX_FMT_YUV422PLE: | 464 case PIX_FMT_YUV422P16LE: |
465 return "yuv422ple"; | 465 return "yuv422p16le"; |
466 case PIX_FMT_YUV444PLE: | 466 case PIX_FMT_YUV444P16LE: |
467 return "yuv444ple"; | 467 return "yuv444p16le"; |
468 case PIX_FMT_YUV420PBE: | 468 case PIX_FMT_YUV420P16BE: |
469 return "yuv420pbe"; | 469 return "yuv420p16be"; |
470 case PIX_FMT_YUV422PBE: | 470 case PIX_FMT_YUV422P16BE: |
471 return "yuv422pbe"; | 471 return "yuv422p16be"; |
472 case PIX_FMT_YUV444PBE: | 472 case PIX_FMT_YUV444P16BE: |
473 return "yuv444pbe"; | 473 return "yuv444p16be"; |
474 default: | 474 default: |
475 return "Unknown format"; | 475 return "Unknown format"; |
476 } | 476 } |
477 } | 477 } |
478 | 478 |
2369 case PIX_FMT_YUYV422: | 2369 case PIX_FMT_YUYV422: |
2370 *h=1; | 2370 *h=1; |
2371 *v=0; | 2371 *v=0; |
2372 break; | 2372 break; |
2373 case PIX_FMT_YUV420P: | 2373 case PIX_FMT_YUV420P: |
2374 case PIX_FMT_YUV420PLE: | 2374 case PIX_FMT_YUV420P16LE: |
2375 case PIX_FMT_YUV420PBE: | 2375 case PIX_FMT_YUV420P16BE: |
2376 case PIX_FMT_YUVA420P: | 2376 case PIX_FMT_YUVA420P: |
2377 case PIX_FMT_GRAY16BE: | 2377 case PIX_FMT_GRAY16BE: |
2378 case PIX_FMT_GRAY16LE: | 2378 case PIX_FMT_GRAY16LE: |
2379 case PIX_FMT_GRAY8: //FIXME remove after different subsamplings are fully implemented | 2379 case PIX_FMT_GRAY8: //FIXME remove after different subsamplings are fully implemented |
2380 case PIX_FMT_NV12: | 2380 case PIX_FMT_NV12: |
2389 case PIX_FMT_YUV410P: | 2389 case PIX_FMT_YUV410P: |
2390 *h=2; | 2390 *h=2; |
2391 *v=2; | 2391 *v=2; |
2392 break; | 2392 break; |
2393 case PIX_FMT_YUV444P: | 2393 case PIX_FMT_YUV444P: |
2394 case PIX_FMT_YUV444PLE: | 2394 case PIX_FMT_YUV444P16LE: |
2395 case PIX_FMT_YUV444PBE: | 2395 case PIX_FMT_YUV444P16BE: |
2396 *h=0; | 2396 *h=0; |
2397 *v=0; | 2397 *v=0; |
2398 break; | 2398 break; |
2399 case PIX_FMT_YUV422P: | 2399 case PIX_FMT_YUV422P: |
2400 case PIX_FMT_YUV422PLE: | 2400 case PIX_FMT_YUV422P16LE: |
2401 case PIX_FMT_YUV422PBE: | 2401 case PIX_FMT_YUV422P16BE: |
2402 *h=1; | 2402 *h=1; |
2403 *v=0; | 2403 *v=0; |
2404 break; | 2404 break; |
2405 case PIX_FMT_YUV411P: | 2405 case PIX_FMT_YUV411P: |
2406 *h=2; | 2406 *h=2; |