*/
#include "avcodec.h"
-#include "get_bits.h"
+#include "bitstream.h"
#include "huffman.h"
#include "bytestream.h"
-#include "dsputil.h"
+#include "bswapdsp.h"
#include "internal.h"
#define FPS_TAG MKTAG('F', 'P', 'S', 'x')
+#define VLC_BITS 11
/**
* local variable storage
*/
typedef struct FrapsContext {
AVCodecContext *avctx;
- AVFrame frame;
+ BswapDSPContext bdsp;
+ AVFrame *frame;
uint8_t *tmpbuf;
int tmpbuf_size;
- DSPContext dsp;
} FrapsContext;
s->avctx = avctx;
s->tmpbuf = NULL;
- avcodec_get_frame_defaults(&s->frame);
+ s->frame = av_frame_alloc();
+ if (!s->frame)
+ return AVERROR(ENOMEM);
- ff_dsputil_init(&s->dsp, avctx);
+ ff_bswapdsp_init(&s->bdsp);
return 0;
}
const int step)
{
int i, j, ret;
- GetBitContext gb;
+ BitstreamContext bc;
VLC vlc;
Node nodes[512];
for (i = 0; i < 256; i++)
nodes[i].count = bytestream_get_le32(&src);
size -= 1024;
- if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp,
+ if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, VLC_BITS,
+ nodes, huff_cmp,
FF_HUFFMAN_FLAG_ZERO_COUNT)) < 0)
return ret;
/* 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((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2);
+ s->bdsp.bswap_buf((uint32_t *) s->tmpbuf,
+ (const uint32_t *) src, size >> 2);
- init_get_bits(&gb, s->tmpbuf, size * 8);
+ bitstream_init(&bc, s->tmpbuf, size * 8);
for (j = 0; j < h; j++) {
for (i = 0; i < w*step; i += step) {
- dst[i] = get_vlc2(&gb, vlc.table, 9, 3);
+ dst[i] = bitstream_read_vlc(&bc, vlc.table, VLC_BITS, 3);
/* lines are stored as deltas between previous lines
* and we need to add 0x80 to the first lines of chroma planes
*/
dst[i] += dst[i - stride];
else if (Uoff)
dst[i] += 0x80;
- if (get_bits_left(&gb) < 0) {
+ if (bitstream_bits_left(&bc) < 0) {
ff_free_vlc(&vlc);
return AVERROR_INVALIDDATA;
}
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AVFrame *frame = data;
- AVFrame * const f = &s->frame;
+ AVFrame * const f = s->frame;
uint32_t header;
unsigned int version,header_size;
unsigned int x, y;
uint32_t offs[4];
int i, j, ret, is_chroma, planes;
enum AVPixelFormat pix_fmt;
+ int prev_pic_bit, expected_size;
+
+ if (buf_size < 4) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too short\n");
+ return AVERROR_INVALIDDATA;
+ }
header = AV_RL32(buf);
version = header & 0xff;
header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */
+ prev_pic_bit = header & (1U << 31); /* bit 31 means same as previous pic */
if (version > 5) {
- av_log(avctx, AV_LOG_ERROR,
- "This file is encoded with Fraps version %d. " \
- "This codec can only decode versions <= 5.\n", version);
+ avpriv_report_missing_feature(avctx, "Fraps version %u", version);
return AVERROR_PATCHWELCOME;
}
av_frame_unref(f);
}
avctx->pix_fmt = pix_fmt;
+ avctx->color_range = version & 1 ? AVCOL_RANGE_UNSPECIFIED
+ : AVCOL_RANGE_JPEG;
+
+ expected_size = header_size;
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)) {
+ if (!prev_pic_bit)
+ expected_size += avctx->width * avctx->height * 3 / 2;
+ if (buf_size != expected_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);
+ buf_size, expected_size);
return AVERROR_INVALIDDATA;
}
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->pict_type = prev_pic_bit ? 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) {
case 1:
/* Fraps v1 is an upside-down BGR24 */
- if ((buf_size != avctx->width * avctx->height * 3 + header_size) &&
- (buf_size != header_size) ) {
+ if (!prev_pic_bit)
+ expected_size += avctx->width * avctx->height * 3;
+ if (buf_size != expected_size) {
av_log(avctx, AV_LOG_ERROR,
"Invalid frame length %d (should be %d)\n",
- buf_size, avctx->width * avctx->height * 3 + header_size);
+ buf_size, expected_size);
return AVERROR_INVALIDDATA;
}
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->pict_type = prev_pic_bit ? 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) {
{
FrapsContext *s = (FrapsContext*)avctx->priv_data;
- av_frame_unref(&s->frame);
+ av_frame_free(&s->frame);
av_freep(&s->tmpbuf);
return 0;
AVCodec ff_fraps_decoder = {
.name = "fraps",
+ .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_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"),
+ .capabilities = AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff