X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faasc.c;h=11ea5779b1a29d3fdbb1a5679d5f644f8d2ba6bc;hb=38c6bbc118661c16b31122691b3d3d5bda13b82f;hp=f720f3eddb4091290d93e474e17481b26d7c8a32;hpb=e4141433ead866d1b359c0cbf3e4d5180477206d;p=ffmpeg diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index f720f3eddb4..11ea5779b1a 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -1,36 +1,36 @@ /* - * Autodesc RLE Decoder + * 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 - * Autodesc RLE Video Decoder by Konstantin Shishkov + * @file + * Autodesk RLE Video Decoder by Konstantin Shishkov */ #include #include #include -#include "common.h" #include "avcodec.h" #include "dsputil.h" +#include "msrledec.h" typedef struct AascContext { AVCodecContext *avctx; @@ -45,30 +45,25 @@ typedef struct AascContext { } \ stream_byte = buf[stream_ptr++]; -static int aasc_decode_init(AVCodecContext *avctx) +static av_cold int aasc_decode_init(AVCodecContext *avctx) { AascContext *s = avctx->priv_data; 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, - 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 stream_ptr = 4; - unsigned char rle_code; - unsigned char stream_byte; - int pixel_ptr = 0; - int row_dec, row_ptr; - int frame_size; - int i; + int compr, i, stride; s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; @@ -77,73 +72,25 @@ static int aasc_decode_frame(AVCodecContext *avctx, return -1; } - row_dec = s->frame.linesize[0]; - row_ptr = (s->avctx->height - 1) * row_dec; - frame_size = row_dec * s->avctx->height; - - while (row_ptr >= 0) { - FETCH_NEXT_STREAM_BYTE(); - rle_code = stream_byte; - if (rle_code == 0) { - /* fetch the next byte to see how to handle escape code */ - FETCH_NEXT_STREAM_BYTE(); - if (stream_byte == 0) { - /* line is done, goto the next one */ - row_ptr -= row_dec; - pixel_ptr = 0; - } else if (stream_byte == 1) { - /* decode is done */ - break; - } else if (stream_byte == 2) { - /* reposition frame decode coordinates */ - FETCH_NEXT_STREAM_BYTE(); - pixel_ptr += stream_byte; - FETCH_NEXT_STREAM_BYTE(); - row_ptr -= stream_byte * row_dec; - } else { - /* copy pixels from encoded stream */ - if ((pixel_ptr + stream_byte > avctx->width * 3) || - (row_ptr < 0)) { - av_log(s->avctx, AV_LOG_ERROR, " AASC: frame ptr just went out of bounds (copy1)\n"); - break; - } - - rle_code = stream_byte; - if (stream_ptr + rle_code > buf_size) { - av_log(s->avctx, AV_LOG_ERROR, " AASC: stream ptr just went out of bounds (copy2)\n"); - break; - } - - for (i = 0; i < rle_code; i++) { - FETCH_NEXT_STREAM_BYTE(); - s->frame.data[0][row_ptr + pixel_ptr] = stream_byte; - pixel_ptr++; - } - if (rle_code & 1) - stream_ptr++; - } - } else { - /* decode a run of data */ - if ((pixel_ptr + rle_code > avctx->width * 3) || - (row_ptr < 0)) { - av_log(s->avctx, AV_LOG_ERROR, " AASC: frame ptr just went out of bounds (run1)\n"); - break; - } - - FETCH_NEXT_STREAM_BYTE(); - - while(rle_code--) { - s->frame.data[0][row_ptr + pixel_ptr] = stream_byte; - pixel_ptr++; - } + 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; } - /* one last sanity check on the way out */ - if (stream_ptr < buf_size) - av_log(s->avctx, AV_LOG_ERROR, " AASC: ended frame decode with bytes left over (%d < %d)\n", - stream_ptr, buf_size); - *data_size = sizeof(AVFrame); *(AVFrame*)data = s->frame; @@ -151,7 +98,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, return buf_size; } -static int aasc_decode_end(AVCodecContext *avctx) +static av_cold int aasc_decode_end(AVCodecContext *avctx) { AascContext *s = avctx->priv_data; @@ -162,14 +109,14 @@ static int aasc_decode_end(AVCodecContext *avctx) 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"), };