virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Add RLE4 and RLE8 decoding support for BMP

Browse Source 
Originally committed as revision 15390 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov
2008-09-23 08:45:12 +00:00
parent 15501c32d0
commit fca506dfb6
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@@ -41,7 +41,7 @@ OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o mdct.o fft.o
OBJS-$(CONFIG_AVS_DECODER) += avs.o OBJS-$(CONFIG_AVS_DECODER) += avs.o
OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o
OBJS-$(CONFIG_BFI_DECODER) += bfi.o OBJS-$(CONFIG_BFI_DECODER) += bfi.o
OBJS-$(CONFIG_BMP_DECODER) += bmp.o OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o
OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
OBJS-$(CONFIG_C93_DECODER) += c93.o OBJS-$(CONFIG_C93_DECODER) += c93.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o golomb.o mpeg12data.o mpegvideo.o OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o golomb.o mpeg12data.o mpegvideo.o

13
libavcodec/bmp.c
View File

@@ -22,6 +22,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "bmp.h" #include "bmp.h"
#include "msrledec.h"
static av_cold int bmp_decode_init(AVCodecContext *avctx){ static av_cold int bmp_decode_init(AVCodecContext *avctx){
BMPContext *s = avctx->priv_data; BMPContext *s = avctx->priv_data;
@@ -107,7 +108,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
else else
comp = BMP_RGB; 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); av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
return -1; return -1;
} }
@@ -196,12 +197,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
/* Line size in file multiple of 4 */ /* Line size in file multiple of 4 */
n = ((avctx->width * depth) / 8 + 3) & ~3; 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", av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
dsize, n * avctx->height); dsize, n * avctx->height);
return -1; 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) if(depth == 4 || depth == 8)
memset(p->data[1], 0, 1024); memset(p->data[1], 0, 1024);
@@ -224,6 +229,9 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
buf = buf0 + hsize; buf = buf0 + hsize;
} }
if(comp == BMP_RLE4 || comp == BMP_RLE8){
ff_msrle_decode(avctx, p, depth, buf, dsize);
}else{
switch(depth){ switch(depth){
case 1: case 1:
for(i = 0; i < avctx->height; i++){ for(i = 0; i < avctx->height; i++){
@@ -290,6 +298,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n"); av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
return -1; return -1;
} }
}
*picture = s->picture; *picture = s->picture;
*data_size = sizeof(AVPicture); *data_size = sizeof(AVPicture);