comparison imgconvert.c @ 4515:a2b14c6fccfd libavcodec

consistency renaming: rgba32 --> rgb32
author diego
date Mon, 12 Feb 2007 23:07:17 +0000
parents ce643a22f049
children 8f6fd50d2f40
comparison
equal deleted inserted replaced
4514:790d1cb93686 4515:a2b14c6fccfd
1707 1707
1708 #define BPP 3 1708 #define BPP 3
1709 1709
1710 #include "imgconvert_template.h" 1710 #include "imgconvert_template.h"
1711 1711
1712 /* rgba32 handling */ 1712 /* rgb32 handling */
1713 1713
1714 #define RGB_NAME rgba32 1714 #define RGB_NAME rgb32
1715 #define FMT_RGBA32 1715 #define FMT_RGB32
1716 1716
1717 #define RGB_IN(r, g, b, s)\ 1717 #define RGB_IN(r, g, b, s)\
1718 {\ 1718 {\
1719 unsigned int v = ((const uint32_t *)(s))[0];\ 1719 unsigned int v = ((const uint32_t *)(s))[0];\
1720 r = (v >> 16) & 0xff;\ 1720 r = (v >> 16) & 0xff;\
1956 }, 1956 },
1957 [PIX_FMT_RGB24] = { 1957 [PIX_FMT_RGB24] = {
1958 .convert = yuv420p_to_rgb24 1958 .convert = yuv420p_to_rgb24
1959 }, 1959 },
1960 [PIX_FMT_RGB32] = { 1960 [PIX_FMT_RGB32] = {
1961 .convert = yuv420p_to_rgba32 1961 .convert = yuv420p_to_rgb32
1962 }, 1962 },
1963 [PIX_FMT_UYVY422] = { 1963 [PIX_FMT_UYVY422] = {
1964 .convert = yuv420p_to_uyvy422, 1964 .convert = yuv420p_to_uyvy422,
1965 }, 1965 },
1966 }, 1966 },
1989 }, 1989 },
1990 [PIX_FMT_RGB24] = { 1990 [PIX_FMT_RGB24] = {
1991 .convert = yuvj420p_to_rgb24 1991 .convert = yuvj420p_to_rgb24
1992 }, 1992 },
1993 [PIX_FMT_RGB32] = { 1993 [PIX_FMT_RGB32] = {
1994 .convert = yuvj420p_to_rgba32 1994 .convert = yuvj420p_to_rgb32
1995 }, 1995 },
1996 }, 1996 },
1997 [PIX_FMT_YUVJ444P] = { 1997 [PIX_FMT_YUVJ444P] = {
1998 [PIX_FMT_RGB24] = { 1998 [PIX_FMT_RGB24] = {
1999 .convert = yuvj444p_to_rgb24 1999 .convert = yuvj444p_to_rgb24
2024 }, 2024 },
2025 [PIX_FMT_RGB555] = { 2025 [PIX_FMT_RGB555] = {
2026 .convert = rgb24_to_rgb555 2026 .convert = rgb24_to_rgb555
2027 }, 2027 },
2028 [PIX_FMT_RGB32] = { 2028 [PIX_FMT_RGB32] = {
2029 .convert = rgb24_to_rgba32 2029 .convert = rgb24_to_rgb32
2030 }, 2030 },
2031 [PIX_FMT_BGR24] = { 2031 [PIX_FMT_BGR24] = {
2032 .convert = rgb24_to_bgr24 2032 .convert = rgb24_to_bgr24
2033 }, 2033 },
2034 [PIX_FMT_GRAY8] = { 2034 [PIX_FMT_GRAY8] = {
2047 .convert = rgb24_to_yuvj444p 2047 .convert = rgb24_to_yuvj444p
2048 }, 2048 },
2049 }, 2049 },
2050 [PIX_FMT_RGB32] = { 2050 [PIX_FMT_RGB32] = {
2051 [PIX_FMT_RGB24] = { 2051 [PIX_FMT_RGB24] = {
2052 .convert = rgba32_to_rgb24 2052 .convert = rgb32_to_rgb24
2053 }, 2053 },
2054 [PIX_FMT_BGR24] = { 2054 [PIX_FMT_BGR24] = {
2055 .convert = rgba32_to_bgr24 2055 .convert = rgb32_to_bgr24
2056 }, 2056 },
2057 [PIX_FMT_RGB565] = { 2057 [PIX_FMT_RGB565] = {
2058 .convert = rgba32_to_rgb565 2058 .convert = rgb32_to_rgb565
2059 }, 2059 },
2060 [PIX_FMT_RGB555] = { 2060 [PIX_FMT_RGB555] = {
2061 .convert = rgba32_to_rgb555 2061 .convert = rgb32_to_rgb555
2062 }, 2062 },
2063 [PIX_FMT_PAL8] = { 2063 [PIX_FMT_PAL8] = {
2064 .convert = rgba32_to_pal8 2064 .convert = rgb32_to_pal8
2065 }, 2065 },
2066 [PIX_FMT_YUV420P] = { 2066 [PIX_FMT_YUV420P] = {
2067 .convert = rgba32_to_yuv420p 2067 .convert = rgb32_to_yuv420p
2068 }, 2068 },
2069 [PIX_FMT_GRAY8] = { 2069 [PIX_FMT_GRAY8] = {
2070 .convert = rgba32_to_gray 2070 .convert = rgb32_to_gray
2071 }, 2071 },
2072 }, 2072 },
2073 [PIX_FMT_BGR24] = { 2073 [PIX_FMT_BGR24] = {
2074 [PIX_FMT_RGB32] = { 2074 [PIX_FMT_RGB32] = {
2075 .convert = bgr24_to_rgba32 2075 .convert = bgr24_to_rgb32
2076 }, 2076 },
2077 [PIX_FMT_RGB24] = { 2077 [PIX_FMT_RGB24] = {
2078 .convert = bgr24_to_rgb24 2078 .convert = bgr24_to_rgb24
2079 }, 2079 },
2080 [PIX_FMT_YUV420P] = { 2080 [PIX_FMT_YUV420P] = {
2087 [PIX_FMT_RGB555] = { 2087 [PIX_FMT_RGB555] = {
2088 [PIX_FMT_RGB24] = { 2088 [PIX_FMT_RGB24] = {
2089 .convert = rgb555_to_rgb24 2089 .convert = rgb555_to_rgb24
2090 }, 2090 },
2091 [PIX_FMT_RGB32] = { 2091 [PIX_FMT_RGB32] = {
2092 .convert = rgb555_to_rgba32 2092 .convert = rgb555_to_rgb32
2093 }, 2093 },
2094 [PIX_FMT_YUV420P] = { 2094 [PIX_FMT_YUV420P] = {
2095 .convert = rgb555_to_yuv420p 2095 .convert = rgb555_to_yuv420p
2096 }, 2096 },
2097 [PIX_FMT_GRAY8] = { 2097 [PIX_FMT_GRAY8] = {
2098 .convert = rgb555_to_gray 2098 .convert = rgb555_to_gray
2099 }, 2099 },
2100 }, 2100 },
2101 [PIX_FMT_RGB565] = { 2101 [PIX_FMT_RGB565] = {
2102 [PIX_FMT_RGB32] = { 2102 [PIX_FMT_RGB32] = {
2103 .convert = rgb565_to_rgba32 2103 .convert = rgb565_to_rgb32
2104 }, 2104 },
2105 [PIX_FMT_RGB24] = { 2105 [PIX_FMT_RGB24] = {
2106 .convert = rgb565_to_rgb24 2106 .convert = rgb565_to_rgb24
2107 }, 2107 },
2108 [PIX_FMT_YUV420P] = { 2108 [PIX_FMT_YUV420P] = {
2140 }, 2140 },
2141 [PIX_FMT_BGR24] = { 2141 [PIX_FMT_BGR24] = {
2142 .convert = gray_to_bgr24 2142 .convert = gray_to_bgr24
2143 }, 2143 },
2144 [PIX_FMT_RGB32] = { 2144 [PIX_FMT_RGB32] = {
2145 .convert = gray_to_rgba32 2145 .convert = gray_to_rgb32
2146 }, 2146 },
2147 [PIX_FMT_MONOWHITE] = { 2147 [PIX_FMT_MONOWHITE] = {
2148 .convert = gray_to_monowhite 2148 .convert = gray_to_monowhite
2149 }, 2149 },
2150 [PIX_FMT_MONOBLACK] = { 2150 [PIX_FMT_MONOBLACK] = {
2179 }, 2179 },
2180 [PIX_FMT_RGB24] = { 2180 [PIX_FMT_RGB24] = {
2181 .convert = pal8_to_rgb24 2181 .convert = pal8_to_rgb24
2182 }, 2182 },
2183 [PIX_FMT_RGB32] = { 2183 [PIX_FMT_RGB32] = {
2184 .convert = pal8_to_rgba32 2184 .convert = pal8_to_rgb32
2185 }, 2185 },
2186 }, 2186 },
2187 [PIX_FMT_UYYVYY411] = { 2187 [PIX_FMT_UYYVYY411] = {
2188 [PIX_FMT_YUV411P] = { 2188 [PIX_FMT_YUV411P] = {
2189 .convert = uyvy411_to_yuv411p, 2189 .convert = uyvy411_to_yuv411p,
2596 /* no alpha can be represented in format */ 2596 /* no alpha can be represented in format */
2597 if (!pf->is_alpha) 2597 if (!pf->is_alpha)
2598 return 0; 2598 return 0;
2599 switch(pix_fmt) { 2599 switch(pix_fmt) {
2600 case PIX_FMT_RGB32: 2600 case PIX_FMT_RGB32:
2601 ret = get_alpha_info_rgba32(src, width, height); 2601 ret = get_alpha_info_rgb32(src, width, height);
2602 break; 2602 break;
2603 case PIX_FMT_PAL8: 2603 case PIX_FMT_PAL8:
2604 ret = get_alpha_info_pal8(src, width, height); 2604 ret = get_alpha_info_pal8(src, width, height);
2605 break; 2605 break;
2606 default: 2606 default: