X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Ffraps.c;h=ed33c3eabf1c7ed47ac9a3a2e8ab58016644c0f1;hb=a43b1e74e2abaac6e63eb001474855bd44335988;hp=73465de9af8cb9d4c267599eb127df2587ed0802;hpb=437c2079b7984f4989dbc924cf06d1645fa90d82;p=ffmpeg diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 73465de9af8..ed33c3eabf1 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -3,27 +3,27 @@ * 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 */ /** - * @file fraps.c + * @file * Lossless Fraps 'FPS1' decoder - * @author Roine Gustafsson + * @author Roine Gustafsson (roine at users sf net) * @author Konstantin Shishkov * * Codec algorithm for version 0 is taken from Transcode @@ -32,7 +32,7 @@ */ #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" #include "huffman.h" #include "bytestream.h" #include "dsputil.h" @@ -55,7 +55,7 @@ typedef struct FrapsContext{ * @param avctx codec context * @return 0 on success or negative if fails */ -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { FrapsContext * const s = avctx->priv_data; @@ -63,7 +63,6 @@ static int decode_init(AVCodecContext *avctx) avctx->pix_fmt= PIX_FMT_NONE; /* set in decode_frame */ s->avctx = avctx; - s->frame.data[0] = NULL; s->tmpbuf = NULL; dsputil_init(&s->dsp, avctx); @@ -84,7 +83,8 @@ static int huff_cmp(const void *va, const void *vb){ * decode Fraps v2 packed plane */ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, - int h, uint8_t *src, int size, int Uoff) + int h, const uint8_t *src, int size, int Uoff, + const int step) { int i, j; GetBitContext gb; @@ -94,16 +94,17 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, for(i = 0; i < 256; i++) nodes[i].count = bytestream_get_le32(&src); size -= 1024; - if (ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp, 0) < 0) + if (ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp, + FF_HUFFMAN_FLAG_ZERO_COUNT) < 0) return -1; /* we have built Huffman table and are ready to decode plane */ /* convert bits so they may be used by standard bitreader */ - s->dsp.bswap_buf(s->tmpbuf, src, size >> 2); + s->dsp.bswap_buf((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2); init_get_bits(&gb, s->tmpbuf, size * 8); for(j = 0; j < h; j++){ - for(i = 0; i < w; i++){ + for(i = 0; i < w*step; i += step){ dst[i] = get_vlc2(&gb, vlc.table, 9, 3); /* lines are stored as deltas between previous lines * and we need to add 0x80 to the first lines of chroma planes @@ -117,39 +118,32 @@ 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, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; FrapsContext * const s = avctx->priv_data; AVFrame *frame = data; AVFrame * const f = (AVFrame*)&s->frame; uint32_t header; unsigned int version,header_size; unsigned int x, y; - uint32_t *buf32; + const uint32_t *buf32; uint32_t *luma1,*luma2,*cb,*cr; uint32_t offs[4]; - int i, is_chroma, planes; + int i, j, is_chroma, planes; header = AV_RL32(buf); version = header & 0xff; header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */ - if (version > 2 && version != 4) { + if (version > 5) { av_log(avctx, AV_LOG_ERROR, "This file is encoded with Fraps version %d. " \ - "This codec can only decode version 0, 1, 2 and 4.\n", version); + "This codec can only decode versions <= 5.\n", version); return -1; } @@ -161,7 +155,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) ) { @@ -186,11 +180,11 @@ 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) { - buf32=(uint32_t*)buf; + 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] ]; luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ]; @@ -229,14 +223,14 @@ 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], - f->linesize[0]); + 3*avctx->width); } break; @@ -246,7 +240,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 | @@ -258,11 +252,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"); @@ -280,11 +274,60 @@ static int decode_frame(AVCodecContext *avctx, is_chroma = !!i; s->tmpbuf = av_realloc(s->tmpbuf, offs[i + 1] - offs[i] - 1024 + FF_INPUT_BUFFER_PADDING_SIZE); if(fraps2_decode_plane(s, f->data[i], f->linesize[i], avctx->width >> is_chroma, - avctx->height >> is_chroma, buf + offs[i], offs[i + 1] - offs[i], is_chroma) < 0) { + avctx->height >> is_chroma, buf + offs[i], offs[i + 1] - offs[i], is_chroma, 1) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i); + return -1; + } + } + break; + case 3: + case 5: + /* Virtually the same as version 4, but is for RGB24 */ + avctx->pix_fmt = PIX_FMT_BGR24; + planes = 3; + f->reference = 1; + f->buffer_hints = FF_BUFFER_HINTS_VALID | + FF_BUFFER_HINTS_PRESERVE | + FF_BUFFER_HINTS_REUSABLE; + if (avctx->reget_buffer(avctx, f)) { + av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + return -1; + } + /* skip frame */ + if(buf_size == 8) { + f->pict_type = AV_PICTURE_TYPE_P; + f->key_frame = 0; + break; + } + 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"); + return -1; + } + for(i = 0; i < planes; i++) { + offs[i] = AV_RL32(buf + 4 + i * 4); + if(offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) { + av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i); + return -1; + } + } + offs[planes] = buf_size; + for(i = 0; i < planes; i++){ + s->tmpbuf = av_realloc(s->tmpbuf, offs[i + 1] - offs[i] - 1024 + FF_INPUT_BUFFER_PADDING_SIZE); + if(fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)), -f->linesize[0], + avctx->width, avctx->height, buf + offs[i], offs[i + 1] - offs[i], 0, 3) < 0) { av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i); return -1; } } + // convert pseudo-YUV into real RGB + for(j = 0; j < avctx->height; j++){ + for(i = 0; i < avctx->width; i++){ + f->data[0][0 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]]; + f->data[0][2 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]]; + } + } break; } @@ -300,7 +343,7 @@ static int decode_frame(AVCodecContext *avctx, * @param avctx codec context * @return 0 on success or negative if fails */ -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { FrapsContext *s = (FrapsContext*)avctx->priv_data; @@ -312,14 +355,14 @@ static int decode_end(AVCodecContext *avctx) } -AVCodec fraps_decoder = { - "fraps", - CODEC_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"), };