[FFmpeg-cvslog] r18970 - trunk/libavcodec/msrle.c
bcoudurier
subversion
Wed May 27 23:45:25 CEST 2009
Author: bcoudurier
Date: Wed May 27 23:45:25 2009
New Revision: 18970
Log:
mslre uncompressed decoding, fix #1074 and many other samples under /RLE
Modified:
trunk/libavcodec/msrle.c
Modified: trunk/libavcodec/msrle.c
==============================================================================
--- trunk/libavcodec/msrle.c Wed May 27 23:40:10 2009 (r18969)
+++ trunk/libavcodec/msrle.c Wed May 27 23:45:25 2009 (r18970)
@@ -55,7 +55,19 @@ static av_cold int msrle_decode_init(AVC
s->avctx = avctx;
- avctx->pix_fmt = PIX_FMT_PAL8;
+ switch (avctx->bits_per_coded_sample) {
+ case 4:
+ case 8:
+ avctx->pix_fmt = PIX_FMT_PAL8;
+ break;
+ case 24:
+ avctx->pix_fmt = PIX_FMT_BGR24;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "unsupported bits per sample\n");
+ return -1;
+ }
+
s->frame.data[0] = NULL;
return 0;
@@ -68,6 +80,7 @@ static int msrle_decode_frame(AVCodecCon
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
MsrleContext *s = avctx->priv_data;
+ int istride = FFALIGN(avctx->width*avctx->bits_per_coded_sample, 32) / 8;
s->buf = buf;
s->size = buf_size;
@@ -88,7 +101,30 @@ static int msrle_decode_frame(AVCodecCon
}
}
- ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
+ /* FIXME how to correctly detect RLE ??? */
+ if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
+ int linesize = avctx->width * avctx->bits_per_coded_sample / 8;
+ uint8_t *ptr = s->frame.data[0];
+ uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
+ int i, j;
+
+ for (i = 0; i < avctx->height; i++) {
+ if (avctx->bits_per_coded_sample == 4) {
+ for (j = 0; j < avctx->width - 1; j += 2) {
+ ptr[j+0] = buf[j>>1] >> 4;
+ ptr[j+1] = buf[j>>1] & 0xF;
+ }
+ if (avctx->width & 1)
+ ptr[j+0] = buf[j>>1] >> 4;
+ } else {
+ memcpy(ptr, buf, linesize);
+ }
+ buf -= istride;
+ ptr += s->frame.linesize[0];
+ }
+ } else {
+ ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
+ }
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
More information about the ffmpeg-cvslog
mailing list