highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aasc: support "Autodesk 24 bit RLE compressor" (FourCC: aas4)

Browse Source 
fixes ticket #1310

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Piotr Bandurski 2012-05-16 11:51:26 +02:00 committed by Michael Niedermayer
parent e556121ec1
commit 4d37877632
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/aasc.c
View File

@ -68,6 +68,12 @@ static int aasc_decode_frame(AVCodecContext *avctx,
compr = AV_RL32(buf); compr = AV_RL32(buf);
buf += 4; buf += 4;
buf_size -= 4; buf_size -= 4;
switch (avctx->codec_tag) {
case MKTAG('A', 'A', 'S', '4'):
bytestream2_init(&s->gb, buf - 4, buf_size + 4);
ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, &s->gb);
break;
case MKTAG('A', 'A', 'S', 'C'):
switch(compr){ switch(compr){
case 0: case 0:
stride = (avctx->width * 3 + 3) & ~3; stride = (avctx->width * 3 + 3) & ~3;
@ -89,6 +95,11 @@ static int aasc_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
return -1; return -1;
} }
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unknown FourCC: %X\n", avctx->codec_tag);
return -1;
}
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame; *(AVFrame*)data = s->frame;

1
libavformat/riff.c
View File

@ -260,6 +260,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_VC1IMAGE, MKTAG('W', 'V', 'P', '2') }, { CODEC_ID_VC1IMAGE, MKTAG('W', 'V', 'P', '2') },
{ CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') }, { CODEC_ID_LOCO, MKTAG('L', 'O', 'C', 'O') },
{ CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') }, { CODEC_ID_WNV1, MKTAG('W', 'N', 'V', '1') },
{ CODEC_ID_AASC, MKTAG('A', 'A', 'S', '4') },
{ CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') }, { CODEC_ID_AASC, MKTAG('A', 'A', 'S', 'C') },
{ CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') }, { CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
{ CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') }, { CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },