* Autodesk RLE Decoder
* Copyright (C) 2005 the ffmpeg project
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file aasc.c
+ * @file
* Autodesk RLE Video Decoder by Konstantin Shishkov
*/
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_BGR24;
- s->frame.data[0] = NULL;
return 0;
}
static int aasc_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;
AascContext *s = avctx->priv_data;
+ int compr, i, stride;
s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
return -1;
}
- ff_msrle_decode(avctx, &s->frame, 8, buf, buf_size);
+ compr = AV_RL32(buf);
+ buf += 4;
+ buf_size -= 4;
+ switch(compr){
+ case 0:
+ stride = (avctx->width * 3 + 3) & ~3;
+ for(i = avctx->height - 1; i >= 0; i--){
+ memcpy(s->frame.data[0] + i*s->frame.linesize[0], buf, avctx->width*3);
+ buf += stride;
+ }
+ break;
+ case 1:
+ ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, buf - 4, buf_size + 4);
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
+ return -1;
+ }
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
return 0;
}
-AVCodec aasc_decoder = {
- "aasc",
- CODEC_TYPE_VIDEO,
- CODEC_ID_AASC,
- sizeof(AascContext),
- aasc_decode_init,
- NULL,
- aasc_decode_end,
- aasc_decode_frame,
- CODEC_CAP_DR1,
+AVCodec ff_aasc_decoder = {
+ .name = "aasc",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_AASC,
+ .priv_data_size = sizeof(AascContext),
+ .init = aasc_decode_init,
+ .close = aasc_decode_end,
+ .decode = aasc_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
};