Mercurial > libavcodec.hg
comparison imgconvert_template.h @ 4515:a2b14c6fccfd libavcodec
consistency renaming: rgba32 --> rgb32
| author | diego |
|---|---|
| date | Mon, 12 Feb 2007 23:07:17 +0000 |
| parents | 58412faefb46 |
| children | 45d083bbbbe7 |
comparison
equal
deleted
inserted
replaced
| 4514:790d1cb93686 | 4515:a2b14c6fccfd |
|---|---|
| 409 q += dst_wrap; | 409 q += dst_wrap; |
| 410 } | 410 } |
| 411 } | 411 } |
| 412 | 412 |
| 413 // RGB24 has optimised routines | 413 // RGB24 has optimised routines |
| 414 #if !defined(FMT_RGBA32) && !defined(FMT_RGB24) | 414 #if !defined(FMT_RGB32) && !defined(FMT_RGB24) |
| 415 /* alpha support */ | 415 /* alpha support */ |
| 416 | 416 |
| 417 static void glue(rgba32_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, | 417 static void glue(rgb32_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, |
| 418 int width, int height) | 418 int width, int height) |
| 419 { | 419 { |
| 420 const uint8_t *s; | 420 const uint8_t *s; |
| 421 uint8_t *d; | 421 uint8_t *d; |
| 422 int src_wrap, dst_wrap, j, y; | 422 int src_wrap, dst_wrap, j, y; |
| 449 s += src_wrap; | 449 s += src_wrap; |
| 450 d += dst_wrap; | 450 d += dst_wrap; |
| 451 } | 451 } |
| 452 } | 452 } |
| 453 | 453 |
| 454 static void glue(RGB_NAME, _to_rgba32)(AVPicture *dst, const AVPicture *src, | 454 static void glue(RGB_NAME, _to_rgb32)(AVPicture *dst, const AVPicture *src, |
| 455 int width, int height) | 455 int width, int height) |
| 456 { | 456 { |
| 457 const uint8_t *s; | 457 const uint8_t *s; |
| 458 uint8_t *d; | 458 uint8_t *d; |
| 459 int src_wrap, dst_wrap, j, y; | 459 int src_wrap, dst_wrap, j, y; |
| 483 s += src_wrap; | 483 s += src_wrap; |
| 484 d += dst_wrap; | 484 d += dst_wrap; |
| 485 } | 485 } |
| 486 } | 486 } |
| 487 | 487 |
| 488 #endif /* !defined(FMT_RGBA32) */ | 488 #endif /* !defined(FMT_RGB32) */ |
| 489 | 489 |
| 490 #ifndef FMT_RGB24 | 490 #ifndef FMT_RGB24 |
| 491 | 491 |
| 492 static void glue(rgb24_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, | 492 static void glue(rgb24_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src, |
| 493 int width, int height) | 493 int width, int height) |
| 786 } | 786 } |
| 787 } | 787 } |
| 788 | 788 |
| 789 #endif /* FMT_RGB24 */ | 789 #endif /* FMT_RGB24 */ |
| 790 | 790 |
| 791 #if defined(FMT_RGB24) || defined(FMT_RGBA32) | 791 #if defined(FMT_RGB24) || defined(FMT_RGB32) |
| 792 | 792 |
| 793 static void glue(RGB_NAME, _to_pal8)(AVPicture *dst, const AVPicture *src, | 793 static void glue(RGB_NAME, _to_pal8)(AVPicture *dst, const AVPicture *src, |
| 794 int width, int height) | 794 int width, int height) |
| 795 { | 795 { |
| 796 const unsigned char *p; | 796 const unsigned char *p; |
| 832 } | 832 } |
| 833 | 833 |
| 834 build_rgb_palette(dst->data[1], has_alpha); | 834 build_rgb_palette(dst->data[1], has_alpha); |
| 835 } | 835 } |
| 836 | 836 |
| 837 #endif /* defined(FMT_RGB24) || defined(FMT_RGBA32) */ | 837 #endif /* defined(FMT_RGB24) || defined(FMT_RGB32) */ |
| 838 | 838 |
| 839 #ifdef RGBA_IN | 839 #ifdef RGBA_IN |
| 840 | 840 |
| 841 static int glue(get_alpha_info_, RGB_NAME)(const AVPicture *src, | 841 static int glue(get_alpha_info_, RGB_NAME)(const AVPicture *src, |
| 842 int width, int height) | 842 int width, int height) |
| 870 #undef RGB_OUT | 870 #undef RGB_OUT |
| 871 #undef RGBA_OUT | 871 #undef RGBA_OUT |
| 872 #undef BPP | 872 #undef BPP |
| 873 #undef RGB_NAME | 873 #undef RGB_NAME |
| 874 #undef FMT_RGB24 | 874 #undef FMT_RGB24 |
| 875 #undef FMT_RGBA32 | 875 #undef FMT_RGB32 |