#include "avcodec.h"
#include "bytestream.h"
#include "bmp.h"
+#include "msrledec.h"
static av_cold int bmp_decode_init(AVCodecContext *avctx){
BMPContext *s = avctx->priv_data;
static int bmp_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
BMPContext *s = avctx->priv_data;
AVFrame *picture = data;
AVFrame *p = &s->picture;
fsize = bytestream_get_le32(&buf);
if(buf_size < fsize){
- av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
+ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n",
buf_size, fsize);
- return -1;
+ fsize = buf_size;
}
buf += 2; /* reserved1 */
buf += 2; /* reserved2 */
hsize = bytestream_get_le32(&buf); /* header size */
- if(fsize <= hsize){
- av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
- fsize, hsize);
- return -1;
- }
-
ihsize = bytestream_get_le32(&buf); /* more header size */
if(ihsize + 14 > hsize){
av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
return -1;
}
- if (ihsize == 40) {
+ /* sometimes file size is set to some headers size, set a real size in that case */
+ if(fsize == 14 || fsize == ihsize + 14)
+ fsize = buf_size - 2;
+
+ if(fsize <= hsize){
+ av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
+ fsize, hsize);
+ return -1;
+ }
+
+ switch(ihsize){
+ case 40: // windib v3
+ case 64: // OS/2 v2
+ case 108: // windib v4
+ case 124: // windib v5
width = bytestream_get_le32(&buf);
height = bytestream_get_le32(&buf);
- } else if (ihsize == 12) {
+ break;
+ case 12: // OS/2 v1
width = bytestream_get_le16(&buf);
height = bytestream_get_le16(&buf);
- } else {
+ break;
+ default:
av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n");
return -1;
}
else
comp = BMP_RGB;
- if(comp != BMP_RGB && comp != BMP_BITFIELDS){
+ if(comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 && comp != BMP_RLE8){
av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
return -1;
}
/* Line size in file multiple of 4 */
n = ((avctx->width * depth) / 8 + 3) & ~3;
- if(n * avctx->height > dsize){
+ if(n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8){
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
dsize, n * avctx->height);
return -1;
}
+ // RLE may skip decoding some picture areas, so blank picture before decoding
+ if(comp == BMP_RLE4 || comp == BMP_RLE8)
+ memset(p->data[0], 0, avctx->height * p->linesize[0]);
+
if(depth == 4 || depth == 8)
memset(p->data[1], 0, 1024);
}
buf = buf0 + hsize;
}
- switch(depth){
- case 1:
- for(i = 0; i < avctx->height; i++){
- memcpy(ptr, buf, n);
- buf += n;
- ptr += linesize;
- }
- break;
- case 4:
- for(i = 0; i < avctx->height; i++){
- int j;
- for(j = 0; j < n; j++){
- ptr[j*2+0] = (buf[j] >> 4) & 0xF;
- ptr[j*2+1] = buf[j] & 0xF;
+ if(comp == BMP_RLE4 || comp == BMP_RLE8){
+ ff_msrle_decode(avctx, (AVPicture*)p, depth, buf, dsize);
+ }else{
+ switch(depth){
+ case 1:
+ case 8:
+ case 24:
+ for(i = 0; i < avctx->height; i++){
+ memcpy(ptr, buf, n);
+ buf += n;
+ ptr += linesize;
}
- buf += n;
- ptr += linesize;
- }
- break;
- case 8:
- for(i = 0; i < avctx->height; i++){
- memcpy(ptr, buf, avctx->width);
- buf += n;
- ptr += linesize;
- }
- break;
- case 24:
- for(i = 0; i < avctx->height; i++){
- memcpy(ptr, buf, avctx->width*(depth>>3));
- buf += n;
- ptr += linesize;
- }
- break;
- case 16:
- for(i = 0; i < avctx->height; i++){
- const uint16_t *src = (const uint16_t *) buf;
- uint16_t *dst = (uint16_t *) ptr;
+ break;
+ case 4:
+ for(i = 0; i < avctx->height; i++){
+ int j;
+ for(j = 0; j < n; j++){
+ ptr[j*2+0] = (buf[j] >> 4) & 0xF;
+ ptr[j*2+1] = buf[j] & 0xF;
+ }
+ buf += n;
+ ptr += linesize;
+ }
+ break;
+ case 16:
+ for(i = 0; i < avctx->height; i++){
+ const uint16_t *src = (const uint16_t *) buf;
+ uint16_t *dst = (uint16_t *) ptr;
- for(j = 0; j < avctx->width; j++)
- *dst++ = le2me_16(*src++);
+ for(j = 0; j < avctx->width; j++)
+ *dst++ = le2me_16(*src++);
- buf += n;
- ptr += linesize;
- }
- break;
- case 32:
- for(i = 0; i < avctx->height; i++){
- const uint8_t *src = buf;
- uint8_t *dst = ptr;
-
- for(j = 0; j < avctx->width; j++){
- dst[0] = src[rgb[2]];
- dst[1] = src[rgb[1]];
- dst[2] = src[rgb[0]];
- dst += 3;
- src += 4;
+ buf += n;
+ ptr += linesize;
}
-
- buf += n;
- ptr += linesize;
+ break;
+ case 32:
+ for(i = 0; i < avctx->height; i++){
+ const uint8_t *src = buf;
+ uint8_t *dst = ptr;
+
+ for(j = 0; j < avctx->width; j++){
+ dst[0] = src[rgb[2]];
+ dst[1] = src[rgb[1]];
+ dst[2] = src[rgb[0]];
+ dst += 3;
+ src += 4;
+ }
+
+ buf += n;
+ ptr += linesize;
+ }
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
+ return -1;
}
- break;
- default:
- av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
- return -1;
}
*picture = s->picture;
NULL,
bmp_decode_end,
bmp_decode_frame,
+ CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("BMP image"),
};
projects / ffmpeg / blobdiff