diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-03-09 09:04:35 +0000 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-03-09 09:04:35 +0000 |
commit | 8c908d7d61d1d5dd5d0114ecfc44d59958523a96 (patch) | |
tree | 18d8b6113f07f045496b1cb4ad1e276a3846dda4 | |
parent | 6a02cb8239f5796c8018df0a0af2a331c86440a9 (diff) | |
download | ffmpeg-streaming-8c908d7d61d1d5dd5d0114ecfc44d59958523a96.zip ffmpeg-streaming-8c908d7d61d1d5dd5d0114ecfc44d59958523a96.tar.gz |
Fraps v5 decoding support
Originally committed as revision 12393 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/fraps.c | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 25fccd5..d180ee0 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -148,7 +148,7 @@ static int decode_frame(AVCodecContext *avctx, version = header & 0xff; header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */ - if (version > 2 && version != 4) { + if (version > 2 && version != 4 && 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); @@ -288,6 +288,47 @@ static int decode_frame(AVCodecContext *avctx, } } break; + 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 = FF_P_TYPE; + f->key_frame = 0; + break; + } + f->pict_type = FF_I_TYPE; + 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], 1, 3) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error decoding plane %i\n", i); + return -1; + } + } + break; } *frame = *f; |