har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support decoding 1bpp and 4bpp palettized sunrast images.

Browse Source 
Fixes ticket #864 and ticket #897.
This commit is contained in:
Carl Eugen Hoyos 2012-01-09 22:38:09 +01:00
parent 625751c47a
commit ceb0dd9f1e
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/sunrast.c
View File

@ -51,7 +51,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
AVFrame *picture = data; AVFrame *picture = data;
AVFrame * const p = &s->picture; AVFrame * const p = &s->picture;
unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen; unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
uint8_t *ptr; uint8_t *ptr, *ptr2 = NULL;
const uint8_t *bufstart = buf; const uint8_t *bufstart = buf;
if (avpkt->size < 32) if (avpkt->size < 32)
@ -90,7 +90,10 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
switch (depth) { switch (depth) {
case 1: case 1:
avctx->pix_fmt = PIX_FMT_MONOWHITE; avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_MONOWHITE;
break;
case 4:
avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_NONE;
break; break;
case 8: case 8:
avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8; avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
@ -121,7 +124,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
if (buf_end - buf < maplength) if (buf_end - buf < maplength)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (depth != 8 && maplength) { if (depth > 8 && maplength) {
av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n"); av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n");
} else if (maplength) { } else if (maplength) {
@ -143,8 +146,15 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
buf += maplength; buf += maplength;
if (maplength && depth < 8) {
ptr = ptr2 = av_malloc((w + 15) * h);
if (!ptr)
return AVERROR(ENOMEM);
stride = (w + 15 >> 3) * depth;
} else {
ptr = p->data[0]; ptr = p->data[0];
stride = p->linesize[0]; stride = p->linesize[0];
}
/* scanlines are aligned on 16 bit boundaries */ /* scanlines are aligned on 16 bit boundaries */
len = (depth * w + 7) >> 3; len = (depth * w + 7) >> 3;
@ -185,6 +195,30 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
buf += alen; buf += alen;
} }
} }
if (avctx->pix_fmt == PIX_FMT_PAL8 && depth < 8) {
uint8_t *ptr_free = ptr2;
ptr = p->data[0];
for (y=0; y<h; y++) {
for (x = 0; x < (w + 7 >> 3) * depth; x++) {
if (depth == 1) {
ptr[8*x] = ptr2[x] >> 7;
ptr[8*x+1] = ptr2[x] >> 6 & 1;
ptr[8*x+2] = ptr2[x] >> 5 & 1;
ptr[8*x+3] = ptr2[x] >> 4 & 1;
ptr[8*x+4] = ptr2[x] >> 3 & 1;
ptr[8*x+5] = ptr2[x] >> 2 & 1;
ptr[8*x+6] = ptr2[x] >> 1 & 1;
ptr[8*x+7] = ptr2[x] & 1;
} else {
ptr[2*x] = ptr2[x] >> 4;
ptr[2*x+1] = ptr2[x] & 0xF;
}
}
ptr += p->linesize[0];
ptr2 += (w + 15 >> 3) * depth;
}
av_freep(&ptr_free);
}
*picture = s->picture; *picture = s->picture;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);