From a6839c4e60635685aac95b81bb9782e06502121a Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 9 Jan 2012 23:12:40 +0000 Subject: [PATCH 1/5] bmpdec: support for rgb444 with bitfields compression Do not display garbage for invalid/unsupported bitfields values. --- libavcodec/bmp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 9a5c244644..bfa70bceb1 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -163,8 +163,18 @@ static int bmp_decode_frame(AVCodecContext *avctx, case 16: if(comp == BMP_RGB) avctx->pix_fmt = PIX_FMT_RGB555; - if(comp == BMP_BITFIELDS) - avctx->pix_fmt = rgb[1] == 0x07E0 ? PIX_FMT_RGB565 : PIX_FMT_RGB555; + else if (comp == BMP_BITFIELDS) { + if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F) + avctx->pix_fmt = PIX_FMT_RGB565; + else if (rgb[0] == 0x7C00 && rgb[1] == 0x03E0 && rgb[2] == 0x001F) + avctx->pix_fmt = PIX_FMT_RGB555; + else if (rgb[0] == 0x0F00 && rgb[1] == 0x00F0 && rgb[2] == 0x000F) + avctx->pix_fmt = PIX_FMT_RGB444; + else { + av_log(avctx, AV_LOG_ERROR, "Unknown bitfields %0X %0X %0X\n", rgb[0], rgb[1], rgb[2]); + return AVERROR(EINVAL); + } + } break; case 8: if(hsize - ihsize - 14 > 0) From 047a28f759e9e501e973c82a488f8f6a3239b9d2 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 10 Jan 2012 00:42:20 +0000 Subject: [PATCH 2/5] bmpenc: support for PIX_FMT_RGB444 --- libavcodec/bmpenc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 9bd700b645..55f8ea79d1 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -28,6 +28,7 @@ static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF }; static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F }; +static const uint32_t rgb444_masks[] = { 0x0F00, 0x00F0, 0x000F }; static av_cold int bmp_encode_init(AVCodecContext *avctx){ BMPContext *s = avctx->priv_data; @@ -40,9 +41,8 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){ avctx->bits_per_coded_sample = 24; break; case PIX_FMT_RGB555: - avctx->bits_per_coded_sample = 16; - break; case PIX_FMT_RGB565: + case PIX_FMT_RGB444: avctx->bits_per_coded_sample = 16; break; case PIX_FMT_RGB8: @@ -79,6 +79,11 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; switch (avctx->pix_fmt) { + case PIX_FMT_RGB444: + compression = BMP_BITFIELDS; + pal = rgb444_masks; // abuse pal to hold color masks + pal_entries = 3; + break; case PIX_FMT_RGB565: compression = BMP_BITFIELDS; pal = rgb565_masks; // abuse pal to hold color masks @@ -163,7 +168,7 @@ AVCodec ff_bmp_encoder = { .encode = bmp_encode_frame, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_BGR24, - PIX_FMT_RGB555, PIX_FMT_RGB565, + PIX_FMT_RGB555, PIX_FMT_RGB444, PIX_FMT_RGB565, PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, From 277030627d847d1478fe0d64fe7fdeb8fb7d837a Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 10 Jan 2012 02:17:33 +0000 Subject: [PATCH 3/5] rgb2rgb: allow conversion for <15 bpp --- libswscale/swscale_unscaled.c | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 401666b525..748681c0ee 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -404,8 +404,8 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], const enum PixelFormat dstFormat = c->dstFormat; const int srcBpp = (c->srcFormatBpp + 7) >> 3; const int dstBpp = (c->dstFormatBpp + 7) >> 3; - const int srcId = c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 */ - const int dstId = c->dstFormatBpp >> 2; + const int srcId = c->srcFormatBpp; + const int dstId = c->dstFormatBpp; void (*conv)(const uint8_t *src, uint8_t *dst, int src_size) = NULL; #define CONV_IS(src, dst) (srcFormat == PIX_FMT_##src && dstFormat == PIX_FMT_##dst) @@ -427,38 +427,38 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], /* BGR -> BGR */ if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) || (isRGBinInt(srcFormat) && isRGBinInt(dstFormat))) { - switch (srcId | (dstId << 4)) { - case 0x34: conv = rgb16to15; break; - case 0x36: conv = rgb24to15; break; - case 0x38: conv = rgb32to15; break; - case 0x43: conv = rgb15to16; break; - case 0x46: conv = rgb24to16; break; - case 0x48: conv = rgb32to16; break; - case 0x63: conv = rgb15to24; break; - case 0x64: conv = rgb16to24; break; - case 0x68: conv = rgb32to24; break; - case 0x83: conv = rgb15to32; break; - case 0x84: conv = rgb16to32; break; - case 0x86: conv = rgb24to32; break; + switch (srcId | (dstId << 16)) { + case 0x000F0010: conv = rgb16to15; break; + case 0x000F0018: conv = rgb24to15; break; + case 0x000F0020: conv = rgb32to15; break; + case 0x0010000F: conv = rgb15to16; break; + case 0x00100018: conv = rgb24to16; break; + case 0x00100020: conv = rgb32to16; break; + case 0x0018000F: conv = rgb15to24; break; + case 0x00180010: conv = rgb16to24; break; + case 0x00180020: conv = rgb32to24; break; + case 0x0020000F: conv = rgb15to32; break; + case 0x00200010: conv = rgb16to32; break; + case 0x00200018: conv = rgb24to32; break; } } else if ((isBGRinInt(srcFormat) && isRGBinInt(dstFormat)) || (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) { - switch (srcId | (dstId << 4)) { - case 0x33: conv = rgb15tobgr15; break; - case 0x34: conv = rgb16tobgr15; break; - case 0x36: conv = rgb24tobgr15; break; - case 0x38: conv = rgb32tobgr15; break; - case 0x43: conv = rgb15tobgr16; break; - case 0x44: conv = rgb16tobgr16; break; - case 0x46: conv = rgb24tobgr16; break; - case 0x48: conv = rgb32tobgr16; break; - case 0x63: conv = rgb15tobgr24; break; - case 0x64: conv = rgb16tobgr24; break; - case 0x66: conv = rgb24tobgr24; break; - case 0x68: conv = rgb32tobgr24; break; - case 0x83: conv = rgb15tobgr32; break; - case 0x84: conv = rgb16tobgr32; break; - case 0x86: conv = rgb24tobgr32; break; + switch (srcId | (dstId << 16)) { + case 0x000F000F: conv = rgb15tobgr15; break; + case 0x000F0010: conv = rgb16tobgr15; break; + case 0x000F0018: conv = rgb24tobgr15; break; + case 0x000F0020: conv = rgb32tobgr15; break; + case 0x0010000F: conv = rgb15tobgr16; break; + case 0x00100010: conv = rgb16tobgr16; break; + case 0x00100018: conv = rgb24tobgr16; break; + case 0x00100020: conv = rgb32tobgr16; break; + case 0x0018000F: conv = rgb15tobgr24; break; + case 0x00180010: conv = rgb16tobgr24; break; + case 0x00180018: conv = rgb24tobgr24; break; + case 0x00180020: conv = rgb32tobgr24; break; + case 0x0020000F: conv = rgb15tobgr32; break; + case 0x00200010: conv = rgb16tobgr32; break; + case 0x00200018: conv = rgb24tobgr32; break; } } From 4ad40d6d9f489aed3e4b283c640e81585686e4a1 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 10 Jan 2012 17:29:16 +0000 Subject: [PATCH 4/5] rgb2rgb: rgb12tobgr12() --- libswscale/rgb2rgb.c | 13 +++++++++++++ libswscale/rgb2rgb.h | 1 + libswscale/swscale_unscaled.c | 1 + 3 files changed, 15 insertions(+) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 5b84f89ec5..c6c1ebaaa5 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -282,6 +282,19 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size) } } +void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size) +{ + int i; + int num_pixels = src_size >> 1; + + for (i = 0; i < num_pixels; i++) { + unsigned br; + unsigned rgb = ((const uint16_t *)src)[i]; + br = rgb & 0x0F0F; + ((uint16_t *)dst)[i] = (br >> 8) | (rgb & 0x00F0) | (br << 8); + } +} + void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size) { int i; diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index a7542cb211..5d3bbfabe3 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -62,6 +62,7 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size); void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size); +void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size); void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size); void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size); diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 748681c0ee..bf79caabcb 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -444,6 +444,7 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], } else if ((isBGRinInt(srcFormat) && isRGBinInt(dstFormat)) || (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) { switch (srcId | (dstId << 16)) { + case 0x000C000C: conv = rgb12tobgr12; break; case 0x000F000F: conv = rgb15tobgr15; break; case 0x000F0010: conv = rgb16tobgr15; break; case 0x000F0018: conv = rgb24tobgr15; break; From 296a338261ebcfaf7b961a6d1e6a3adb4da69a61 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 10 Jan 2012 18:15:16 +0000 Subject: [PATCH 5/5] rgb2rgb: remove unused bgr8torgb8() RGB8 and BGR8 are paletted formats now. --- libswscale/rgb2rgb.c | 15 --------------- libswscale/rgb2rgb.h | 1 - 2 files changed, 16 deletions(-) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index c6c1ebaaa5..eb7ca7ba1a 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -295,21 +295,6 @@ void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size) } } -void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size) -{ - int i; - int num_pixels = src_size; - for (i=0; i>3; - b = (rgb&0xC0)>>6; - dst[i] = ((b<<1)&0x07) | ((g&0x07)<<3) | ((r&0x03)<<6); - } -} - #define DEFINE_SHUFFLE_BYTES(a, b, c, d) \ void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, int src_size) \ { \ diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 5d3bbfabe3..4e63124977 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -63,7 +63,6 @@ void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size); void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size); void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size); -void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size); void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size); void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);