X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ffraps.c;h=1444eda979121c0f92628321c665dbab62863a4e;hb=c914038d381df57a9b22fb98f8083d6bea2e4856;hp=0829ac7e74eafc49e82bb26ba40e60bf20622648;hpb=9eb42c272b122f8da02e361fc45c1f6f63c15c8a;p=ffmpeg diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 0829ac7e74e..1444eda9791 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -3,20 +3,20 @@ * Copyright (c) 2005 Roine Gustafsson * Copyright (c) 2006 Konstantin Shishkov * - * 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 */ @@ -111,6 +111,10 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, */ if(j) dst[i] += dst[i - stride]; else if(Uoff) dst[i] += 0x80; + if (get_bits_left(&gb) < 0) { + free_vlc(&vlc); + return AVERROR_INVALIDDATA; + } } dst += stride; } @@ -118,15 +122,6 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, return 0; } -/** - * decode a frame - * @param avctx codec context - * @param data output AVFrame - * @param data_size size of output data or 0 if no picture is returned - * @param buf input data frame - * @param buf_size size of input data frame - * @return number of consumed bytes on success or negative if decode fails - */ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) @@ -164,7 +159,7 @@ static int decode_frame(AVCodecContext *avctx, case 0: default: /* Fraps v0 is a reordered YUV420 */ - avctx->pix_fmt = PIX_FMT_YUV420P; + avctx->pix_fmt = PIX_FMT_YUVJ420P; if ( (buf_size != avctx->width*avctx->height*3/2+header_size) && (buf_size != header_size) ) { @@ -189,10 +184,10 @@ static int decode_frame(AVCodecContext *avctx, return -1; } /* bit 31 means same as previous pic */ - f->pict_type = (header & (1<<31))? FF_P_TYPE : FF_I_TYPE; - f->key_frame = f->pict_type == FF_I_TYPE; + f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; - if (f->pict_type == FF_I_TYPE) { + if (f->pict_type == AV_PICTURE_TYPE_I) { buf32=(const uint32_t*)buf; for(y=0; yheight/2; y++){ luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ]; @@ -232,10 +227,10 @@ static int decode_frame(AVCodecContext *avctx, return -1; } /* bit 31 means same as previous pic */ - f->pict_type = (header & (1<<31))? FF_P_TYPE : FF_I_TYPE; - f->key_frame = f->pict_type == FF_I_TYPE; + f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; - if (f->pict_type == FF_I_TYPE) { + if (f->pict_type == AV_PICTURE_TYPE_I) { for(y=0; yheight; y++) memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ], &buf[y*avctx->width*3], @@ -249,7 +244,7 @@ static int decode_frame(AVCodecContext *avctx, * Fraps v2 is Huffman-coded YUV420 planes * Fraps v4 is virtually the same */ - avctx->pix_fmt = PIX_FMT_YUV420P; + avctx->pix_fmt = PIX_FMT_YUVJ420P; planes = 3; f->reference = 1; f->buffer_hints = FF_BUFFER_HINTS_VALID | @@ -261,11 +256,11 @@ static int decode_frame(AVCodecContext *avctx, } /* skip frame */ if(buf_size == 8) { - f->pict_type = FF_P_TYPE; + f->pict_type = AV_PICTURE_TYPE_P; f->key_frame = 0; break; } - f->pict_type = FF_I_TYPE; + f->pict_type = AV_PICTURE_TYPE_I; f->key_frame = 1; if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) { av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); @@ -304,11 +299,11 @@ static int decode_frame(AVCodecContext *avctx, } /* skip frame */ if(buf_size == 8) { - f->pict_type = FF_P_TYPE; + f->pict_type = AV_PICTURE_TYPE_P; f->key_frame = 0; break; } - f->pict_type = FF_I_TYPE; + f->pict_type = AV_PICTURE_TYPE_I; f->key_frame = 1; if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) { av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); @@ -364,15 +359,14 @@ static av_cold int decode_end(AVCodecContext *avctx) } -AVCodec fraps_decoder = { - "fraps", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_FRAPS, - sizeof(FrapsContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, +AVCodec ff_fraps_decoder = { + .name = "fraps", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_FRAPS, + .priv_data_size = sizeof(FrapsContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Fraps"), };