# HG changeset patch # User tmmm # Date 1063420263 0 # Node ID 51239e385475871ef90537ac09afbeee55d8eff4 # Parent ca24abf4af223a30bacb10627da3c4e57340828d final word on RGBA byte order diff -r ca24abf4af22 -r 51239e385475 avcodec.h --- a/avcodec.h Fri Sep 12 18:25:04 2003 +0000 +++ b/avcodec.h Sat Sep 13 02:31:03 2003 +0000 @@ -115,7 +115,19 @@ }; /** - * Pixel format. + * Pixel format. Notes: + * + * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on + * big endian CPUs. + * + * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized + * image data is stored in AVFrame.data[0]. The palette is transported in + * AVFrame.data[1] and, is 1024 bytes long (256 4-byte entries) and is + * formatted the same as in PIX_FMT_RGBA32 described above (i.e., it is + * also endian-specific). */ enum PixelFormat { PIX_FMT_YUV420P, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) @@ -124,7 +136,7 @@ PIX_FMT_BGR24, ///< Packed pixel, 3 bytes per pixel, BGRBGR... PIX_FMT_YUV422P, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) PIX_FMT_YUV444P, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) - PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA..., stored in cpu endianness PIX_FMT_YUV410P, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) PIX_FMT_YUV411P, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) PIX_FMT_RGB565, ///< always stored in cpu endianness diff -r ca24abf4af22 -r 51239e385475 xan.c --- a/xan.c Fri Sep 12 18:25:04 2003 +0000 +++ b/xan.c Sat Sep 13 02:31:03 2003 +0000 @@ -265,17 +265,6 @@ switch (s->avctx->pix_fmt) { - case PIX_FMT_PAL8: - for (i = 0; i < PALETTE_COUNT; i++) { - r = *palette_data++; - g = *palette_data++; - b = *palette_data++; - s->palette[i * 4 + 0] = b; - s->palette[i * 4 + 1] = g; - s->palette[i * 4 + 2] = r; - } - break; - case PIX_FMT_RGB555: palette16 = (unsigned short *)s->palette; for (i = 0; i < PALETTE_COUNT; i++) { @@ -321,6 +310,7 @@ } break; + case PIX_FMT_PAL8: case PIX_FMT_RGBA32: palette32 = (unsigned int *)s->palette; for (i = 0; i < PALETTE_COUNT; i++) {