X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fqdrw.c;h=7410f6e152ac3dc7c453dec34184095f0a9ba3f8;hb=26f71ef48c0b6fb9f278528c8251850a76bcd3fe;hp=84636591742482eed8205d4bc3c872499a45b5e5;hpb=5509bffa88238d1f445a84a32e3791bfb9e532fd;p=ffmpeg diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 84636591742..7410f6e152a 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -2,45 +2,50 @@ * QuickDraw (qdrw) codec * Copyright (c) 2004 Konstantin Shishkov * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library 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 this library; 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 qdrw.c + * @file * Apple QuickDraw codec. */ +#include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "mpegvideo.h" typedef struct QdrawContext{ AVCodecContext *avctx; AVFrame pic; - uint8_t palette[256*3]; } QdrawContext; static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = avpkt->data + avpkt->size; + int buf_size = avpkt->size; QdrawContext * const a = avctx->priv_data; AVFrame * const p= (AVFrame*)&a->pic; uint8_t* outdata; int colors; int i; + uint32_t *pal; + int r, g, b; if(p->data[0]) avctx->release_buffer(avctx, p); @@ -50,23 +55,28 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - p->pict_type= I_TYPE; + p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; outdata = a->pic.data[0]; + if (buf_end - buf < 0x68 + 4) + return AVERROR_INVALIDDATA; buf += 0x68; /* jump to palette */ - colors = BE_32(buf); + colors = AV_RB32(buf); buf += 4; if(colors < 0 || colors > 256) { av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); return -1; } + if (buf_end - buf < (colors + 1) * 8) + return AVERROR_INVALIDDATA; + pal = (uint32_t*)p->data[1]; for (i = 0; i <= colors; i++) { unsigned int idx; - idx = BE_16(buf); /* color index */ + idx = AV_RB16(buf); /* color index */ buf += 2; if (idx > 255) { @@ -74,51 +84,52 @@ static int decode_frame(AVCodecContext *avctx, buf += 6; continue; } - a->palette[idx * 3 + 0] = *buf++; + r = *buf++; buf++; - a->palette[idx * 3 + 1] = *buf++; + g = *buf++; buf++; - a->palette[idx * 3 + 2] = *buf++; + b = *buf++; buf++; + pal[idx] = (r << 16) | (g << 8) | b; } + p->palette_has_changed = 1; + if (buf_end - buf < 18) + return AVERROR_INVALIDDATA; buf += 18; /* skip unneeded data */ for (i = 0; i < avctx->height; i++) { int size, left, code, pix; - uint8_t *next; + const uint8_t *next; uint8_t *out; int tsize = 0; /* decode line */ out = outdata; - size = BE_16(buf); /* size of packed line */ + size = AV_RB16(buf); /* size of packed line */ buf += 2; + if (buf_end - buf < size) + return AVERROR_INVALIDDATA; + left = size; next = buf + size; while (left > 0) { code = *buf++; if (code & 0x80 ) { /* run */ - int i; pix = *buf++; - if ((out + (257 - code) * 3) > (outdata + a->pic.linesize[0])) + if ((out + (257 - code)) > (outdata + a->pic.linesize[0])) break; - for (i = 0; i < 257 - code; i++) { - *out++ = a->palette[pix * 3 + 0]; - *out++ = a->palette[pix * 3 + 1]; - *out++ = a->palette[pix * 3 + 2]; - } + memset(out, pix, 257 - code); + out += 257 - code; tsize += 257 - code; left -= 2; } else { /* copy */ - int i, pix; - if ((out + code * 3) > (outdata + a->pic.linesize[0])) + if ((out + code) > (outdata + a->pic.linesize[0])) break; - for (i = 0; i <= code; i++) { - pix = *buf++; - *out++ = a->palette[pix * 3 + 0]; - *out++ = a->palette[pix * 3 + 1]; - *out++ = a->palette[pix * 3 + 2]; - } + if (buf_end - buf < code + 1) + return AVERROR_INVALIDDATA; + memcpy(out, buf, code + 1); + out += code + 1; + buf += code + 1; left -= 2 + code; tsize += code + 1; } @@ -133,26 +144,32 @@ static int decode_frame(AVCodecContext *avctx, return buf_size; } -static int decode_init(AVCodecContext *avctx){ +static av_cold int decode_init(AVCodecContext *avctx){ // QdrawContext * const a = avctx->priv_data; - if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { - return 1; - } + avctx->pix_fmt= PIX_FMT_PAL8; + + return 0; +} + +static av_cold int decode_end(AVCodecContext *avctx){ + QdrawContext * const a = avctx->priv_data; + AVFrame *pic = &a->pic; - avctx->pix_fmt= PIX_FMT_RGB24; + if (pic->data[0]) + avctx->release_buffer(avctx, pic); return 0; } -AVCodec qdraw_decoder = { - "qdraw", - CODEC_TYPE_VIDEO, - CODEC_ID_QDRAW, - sizeof(QdrawContext), - decode_init, - NULL, - NULL, - decode_frame, - CODEC_CAP_DR1, +AVCodec ff_qdraw_decoder = { + .name = "qdraw", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_QDRAW, + .priv_data_size = sizeof(QdrawContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), };