X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fc93.c;h=2729ee8fcbb05390dac077da3fb7a350dc220d70;hb=7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7;hp=7502de6cff37b7e65cfdf7002b427784c71f6a02;hpb=bee4f778ae34a779c5a234443acd1c852315a77a;p=ffmpeg diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 7502de6cff3..2729ee8fcbb 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -2,29 +2,29 @@ * Interplay C93 video decoder * Copyright (c) 2007 Anssi Hannula * - * 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 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" -typedef struct { - AVFrame pictures[2]; +typedef struct C93DecoderContext { + AVFrame *pictures[2]; int currentpic; } C93DecoderContext; @@ -46,20 +46,28 @@ typedef enum { #define C93_HAS_PALETTE 0x01 #define C93_FIRST_FRAME 0x02 -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { - avctx->pix_fmt = PIX_FMT_PAL8; + C93DecoderContext * const c93 = avctx->priv_data; + + av_frame_free(&c93->pictures[0]); + av_frame_free(&c93->pictures[1]); + return 0; } -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { - C93DecoderContext * const c93 = avctx->priv_data; + C93DecoderContext *s = avctx->priv_data; + avctx->pix_fmt = AV_PIX_FMT_PAL8; + + s->pictures[0] = av_frame_alloc(); + s->pictures[1] = av_frame_alloc(); + if (!s->pictures[0] || !s->pictures[1]) { + decode_end(avctx); + return AVERROR(ENOMEM); + } - if (c93->pictures[0].data[0]) - avctx->release_buffer(avctx, &c93->pictures[0]); - if (c93->pictures[1].data[0]) - avctx->release_buffer(avctx, &c93->pictures[1]); return 0; } @@ -80,7 +88,7 @@ static inline int copy_block(AVCodecContext *avctx, uint8_t *to, if (from_y + height > HEIGHT) { av_log(avctx, AV_LOG_ERROR, "invalid offset %d during C93 decoding\n", offset); - return -1; + return AVERROR_INVALIDDATA; } if (overflow > 0) { @@ -114,62 +122,53 @@ static inline void draw_n_color(uint8_t *out, int stride, int width, } static int decode_frame(AVCodecContext *avctx, void *data, - int *data_size, uint8_t * buf, int buf_size) + int *got_frame, AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; C93DecoderContext * const c93 = avctx->priv_data; - AVFrame * const newpic = &c93->pictures[c93->currentpic]; - AVFrame * const oldpic = &c93->pictures[c93->currentpic^1]; - AVFrame *picture = data; + AVFrame * const newpic = c93->pictures[c93->currentpic]; + AVFrame * const oldpic = c93->pictures[c93->currentpic^1]; + GetByteContext gb; uint8_t *out; - int stride, i, x, y; - C93BlockType bt = 0; + int stride, ret, i, x, y, b, bt = 0; c93->currentpic ^= 1; - newpic->reference = 1; - newpic->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | - FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; - if (avctx->reget_buffer(avctx, newpic)) { + if ((ret = ff_reget_buffer(avctx, newpic)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } stride = newpic->linesize[0]; - if (buf[0] & C93_FIRST_FRAME) { - newpic->pict_type = FF_I_TYPE; + bytestream2_init(&gb, buf, buf_size); + b = bytestream2_get_byte(&gb); + if (b & C93_FIRST_FRAME) { + newpic->pict_type = AV_PICTURE_TYPE_I; newpic->key_frame = 1; } else { - newpic->pict_type = FF_P_TYPE; + newpic->pict_type = AV_PICTURE_TYPE_P; newpic->key_frame = 0; } - if (*buf++ & C93_HAS_PALETTE) { - uint32_t *palette = (uint32_t *) newpic->data[1]; - uint8_t *palbuf = buf + buf_size - 768 - 1; - for (i = 0; i < 256; i++) { - palette[i] = bytestream_get_be24(&palbuf); - } - } else { - if (oldpic->data[1]) - memcpy(newpic->data[1], oldpic->data[1], 256 * 4); - } - for (y = 0; y < HEIGHT; y += 8) { out = newpic->data[0] + y * stride; for (x = 0; x < WIDTH; x += 8) { uint8_t *copy_from = oldpic->data[0]; unsigned int offset, j; uint8_t cols[4], grps[4]; + C93BlockType block_type; if (!bt) - bt = *buf++; + bt = bytestream2_get_byte(&gb); - switch (bt & 0x0F) { + block_type= bt & 0x0F; + switch (block_type) { case C93_8X8_FROM_PREV: - offset = bytestream_get_le16(&buf); - if (copy_block(avctx, out, copy_from, offset, 8, stride)) - return -1; + offset = bytestream2_get_le16(&gb); + if ((ret = copy_block(avctx, out, copy_from, offset, 8, stride)) < 0) + return ret; break; case C93_4X4_FROM_CURR: @@ -177,19 +176,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, case C93_4X4_FROM_PREV: for (j = 0; j < 8; j += 4) { for (i = 0; i < 8; i += 4) { - offset = bytestream_get_le16(&buf); - if (copy_block(avctx, &out[j*stride+i], - copy_from, offset, 4, stride)) - return -1; + offset = bytestream2_get_le16(&gb); + if ((ret = copy_block(avctx, &out[j*stride+i], + copy_from, offset, 4, stride)) < 0) + return ret; } } break; case C93_8X8_2COLOR: - bytestream_get_buffer(&buf, cols, 2); + bytestream2_get_buffer(&gb, cols, 2); for (i = 0; i < 8; i++) { draw_n_color(out + i*stride, stride, 8, 1, 1, cols, - NULL, *buf++); + NULL, bytestream2_get_byte(&gb)); } break; @@ -199,18 +198,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, case C93_4X4_4COLOR_GRP: for (j = 0; j < 8; j += 4) { for (i = 0; i < 8; i += 4) { - if ((bt & 0x0F) == C93_4X4_2COLOR) { - bytestream_get_buffer(&buf, cols, 2); + if (block_type == C93_4X4_2COLOR) { + bytestream2_get_buffer(&gb, cols, 2); draw_n_color(out + i + j*stride, stride, 4, 4, - 1, cols, NULL, bytestream_get_le16(&buf)); - } else if ((bt & 0x0F) == C93_4X4_4COLOR) { - bytestream_get_buffer(&buf, cols, 4); + 1, cols, NULL, bytestream2_get_le16(&gb)); + } else if (block_type == C93_4X4_4COLOR) { + bytestream2_get_buffer(&gb, cols, 4); draw_n_color(out + i + j*stride, stride, 4, 4, - 2, cols, NULL, bytestream_get_le32(&buf)); + 2, cols, NULL, bytestream2_get_le32(&gb)); } else { - bytestream_get_buffer(&buf, grps, 4); + bytestream2_get_buffer(&gb, grps, 4); draw_n_color(out + i + j*stride, stride, 4, 4, - 1, cols, grps, bytestream_get_le16(&buf)); + 1, cols, grps, bytestream2_get_le16(&gb)); } } } @@ -221,33 +220,45 @@ static int decode_frame(AVCodecContext *avctx, void *data, case C93_8X8_INTRA: for (j = 0; j < 8; j++) - bytestream_get_buffer(&buf, out + j*stride, 8); + bytestream2_get_buffer(&gb, out + j*stride, 8); break; default: av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n", - bt & 0x0F, x, y); - return -1; + block_type, x, y); + return AVERROR_INVALIDDATA; } bt >>= 4; out += 8; } } - *picture = *newpic; - *data_size = sizeof(AVFrame); + if (b & C93_HAS_PALETTE) { + uint32_t *palette = (uint32_t *) newpic->data[1]; + for (i = 0; i < 256; i++) { + palette[i] = bytestream2_get_be24(&gb); + } + newpic->palette_has_changed = 1; + } else { + if (oldpic->data[1]) + memcpy(newpic->data[1], oldpic->data[1], 256 * 4); + } + + if ((ret = av_frame_ref(data, newpic)) < 0) + return ret; + *got_frame = 1; return buf_size; } -AVCodec c93_decoder = { - "c93", - CODEC_TYPE_VIDEO, - CODEC_ID_C93, - sizeof(C93DecoderContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, +AVCodec ff_c93_decoder = { + .name = "c93", + .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_C93, + .priv_data_size = sizeof(C93DecoderContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, };