diff options
Diffstat (limited to 'libavcodec/fraps.c')
-rw-r--r-- | libavcodec/fraps.c | 214 |
1 files changed, 78 insertions, 136 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 66ecdef419..00a38c6169 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 Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -37,6 +37,7 @@ #include "bytestream.h" #include "dsputil.h" #include "internal.h" +#include "thread.h" #define FPS_TAG MKTAG('F', 'P', 'S', 'x') @@ -45,7 +46,6 @@ */ typedef struct FrapsContext { AVCodecContext *avctx; - AVFrame frame; uint8_t *tmpbuf; int tmpbuf_size; DSPContext dsp; @@ -61,13 +61,9 @@ static av_cold int decode_init(AVCodecContext *avctx) { FrapsContext * const s = avctx->priv_data; - avctx->pix_fmt = AV_PIX_FMT_NONE; /* set in decode_frame */ - s->avctx = avctx; s->tmpbuf = NULL; - avcodec_get_frame_defaults(&s->frame); - ff_dsputil_init(&s->dsp, avctx); return 0; @@ -135,16 +131,17 @@ static int decode_frame(AVCodecContext *avctx, FrapsContext * const s = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - AVFrame *frame = data; - AVFrame * const f = &s->frame; + ThreadFrame frame = { .f = data }; + AVFrame * const f = data; uint32_t header; unsigned int version,header_size; unsigned int x, y; const uint32_t *buf32; uint32_t *luma1,*luma2,*cb,*cr; uint32_t offs[4]; - int i, j, ret, is_chroma, planes; - enum AVPixelFormat pix_fmt; + int i, j, ret, is_chroma; + const int planes = 3; + uint8_t *out; header = AV_RL32(buf); version = header & 0xff; @@ -157,86 +154,89 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - buf += 4; - if (header_size == 8) - buf += 4; + buf += header_size; - pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; - if (avctx->pix_fmt != pix_fmt && f->data[0]) { - av_frame_unref(f); + if (version < 2) { + unsigned needed_size = avctx->width * avctx->height * 3; + if (version == 0) needed_size /= 2; + needed_size += header_size; + /* bit 31 means same as previous pic */ + if (header & (1U<<31)) { + *got_frame = 0; + return buf_size; + } + if (buf_size != needed_size) { + av_log(avctx, AV_LOG_ERROR, + "Invalid frame length %d (should be %d)\n", + buf_size, needed_size); + return AVERROR_INVALIDDATA; + } + } else { + /* skip frame */ + if (buf_size == 8) { + *got_frame = 0; + return buf_size; + } + if (AV_RL32(buf) != FPS_TAG || buf_size < planes*1024 + 24) { + av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); + return AVERROR_INVALIDDATA; + } + for (i = 0; i < planes; i++) { + offs[i] = AV_RL32(buf + 4 + i * 4); + if (offs[i] >= buf_size - header_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 AVERROR_INVALIDDATA; + } + } + offs[planes] = buf_size - header_size; + for (i = 0; i < planes; i++) { + av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024); + if (!s->tmpbuf) + return AVERROR(ENOMEM); + } } - avctx->pix_fmt = pix_fmt; + + f->pict_type = AV_PICTURE_TYPE_I; + f->key_frame = 1; + + avctx->pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; + + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + return ret; switch (version) { case 0: default: /* Fraps v0 is a reordered YUV420 */ - if ((buf_size != avctx->width * avctx->height * 3 / 2 + header_size) && - (buf_size != header_size)) { - av_log(avctx, AV_LOG_ERROR, - "Invalid frame length %d (should be %d)\n", - buf_size, - avctx->width * avctx->height * 3 / 2 + header_size); - return AVERROR_INVALIDDATA; - } - if (((avctx->width % 8) != 0) || ((avctx->height % 2) != 0)) { av_log(avctx, AV_LOG_ERROR, "Invalid frame size %dx%d\n", avctx->width, avctx->height); return AVERROR_INVALIDDATA; } - if ((ret = ff_reget_buffer(avctx, f)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return ret; - } - /* bit 31 means same as previous pic */ - 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 == AV_PICTURE_TYPE_I) { - buf32 = (const uint32_t*)buf; - for (y = 0; y < avctx->height / 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]]; - cr = (uint32_t*)&f->data[1][ y * f->linesize[1]]; - cb = (uint32_t*)&f->data[2][ y * f->linesize[2]]; - for (x = 0; x < avctx->width; x += 8) { - *(luma1++) = *(buf32++); - *(luma1++) = *(buf32++); - *(luma2++) = *(buf32++); - *(luma2++) = *(buf32++); - *(cr++) = *(buf32++); - *(cb++) = *(buf32++); - } + buf32 = (const uint32_t*)buf; + for (y = 0; y < avctx->height / 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] ]; + cr = (uint32_t*)&f->data[1][ y * f->linesize[1] ]; + cb = (uint32_t*)&f->data[2][ y * f->linesize[2] ]; + for (x = 0; x < avctx->width; x += 8) { + *luma1++ = *buf32++; + *luma1++ = *buf32++; + *luma2++ = *buf32++; + *luma2++ = *buf32++; + *cr++ = *buf32++; + *cb++ = *buf32++; } } break; case 1: /* Fraps v1 is an upside-down BGR24 */ - if ((buf_size != avctx->width * avctx->height * 3 + header_size) && - (buf_size != header_size) ) { - av_log(avctx, AV_LOG_ERROR, - "Invalid frame length %d (should be %d)\n", - buf_size, avctx->width * avctx->height * 3 + header_size); - return AVERROR_INVALIDDATA; - } - - if ((ret = ff_reget_buffer(avctx, f)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return ret; - } - /* bit 31 means same as previous pic */ - 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 == AV_PICTURE_TYPE_I) { for (y = 0; y<avctx->height; y++) memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]], &buf[y * avctx->width * 3], 3 * avctx->width); - } break; case 2: @@ -245,37 +245,8 @@ static int decode_frame(AVCodecContext *avctx, * Fraps v2 is Huffman-coded YUV420 planes * Fraps v4 is virtually the same */ - planes = 3; - if ((ret = ff_reget_buffer(avctx, f)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return ret; - } - /* 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 AVERROR_INVALIDDATA; - } - 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 AVERROR_INVALIDDATA; - } - } - offs[planes] = buf_size; for (i = 0; i < planes; i++) { is_chroma = !!i; - av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, - offs[i + 1] - offs[i] - 1024); - if (!s->tmpbuf) - return AVERROR(ENOMEM); if ((ret = fraps2_decode_plane(s, f->data[i], f->linesize[i], avctx->width >> is_chroma, avctx->height >> is_chroma, @@ -289,36 +260,7 @@ static int decode_frame(AVCodecContext *avctx, case 3: case 5: /* Virtually the same as version 4, but is for RGB24 */ - planes = 3; - if ((ret = ff_reget_buffer(avctx, f)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return ret; - } - /* 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 AVERROR_INVALIDDATA; - } 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 AVERROR_INVALIDDATA; - } - } - offs[planes] = buf_size; - for (i = 0; i < planes; i++) { - av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, - offs[i + 1] - offs[i] - 1024); - if (!s->tmpbuf) - return AVERROR(ENOMEM); if ((ret = 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) { @@ -326,18 +268,20 @@ static int decode_frame(AVCodecContext *avctx, return ret; } } + out = f->data[0]; // 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]]; + uint8_t *line_end = out + 3*avctx->width; + while (out < line_end) { + out[0] += out[1]; + out[2] += out[1]; + out += 3; } + out += f->linesize[0] - 3*avctx->width; } break; } - if ((ret = av_frame_ref(frame, f)) < 0) - return ret; *got_frame = 1; return buf_size; @@ -353,8 +297,6 @@ static av_cold int decode_end(AVCodecContext *avctx) { FrapsContext *s = (FrapsContext*)avctx->priv_data; - av_frame_unref(&s->frame); - av_freep(&s->tmpbuf); return 0; } @@ -368,6 +310,6 @@ AVCodec ff_fraps_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, .long_name = NULL_IF_CONFIG_SMALL("Fraps"), }; |