diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-01-19 23:14:27 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-01-21 18:08:08 +0100 |
| commit | d60f090dd187ef8cdd64c556f4820491f1caa23d (patch) | |
| tree | 98863d66a128fef51db19b986de910d194d95fa8 /libavcodec/fraps.c | |
| parent | cde007dcd3487314090eb47617a7497c9bb5b46f (diff) | |
| download | ffmpeg-d60f090dd187ef8cdd64c556f4820491f1caa23d.tar.gz | |
avcodec/fraps: add support for PAL8
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/fraps.c')
| -rw-r--r-- | libavcodec/fraps.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 57e13f2685..5ca6affa4a 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -146,6 +146,7 @@ static int decode_frame(AVCodecContext *avctx, uint32_t offs[4]; int i, j, ret, is_chroma; const int planes = 3; + int is_pal; uint8_t *out; if (buf_size < 4) { @@ -155,6 +156,7 @@ static int decode_frame(AVCodecContext *avctx, header = AV_RL32(buf); version = header & 0xff; + is_pal = buf[1] == 2 && version == 1; header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */ if (version > 5) { @@ -166,7 +168,16 @@ static int decode_frame(AVCodecContext *avctx, buf += header_size; - if (version < 2) { + if (is_pal) { + unsigned needed_size = avctx->width * avctx->height + 1024; + needed_size += header_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 if (version < 2) { unsigned needed_size = avctx->width * avctx->height * 3; if (version == 0) needed_size /= 2; needed_size += header_size; @@ -209,7 +220,7 @@ static int decode_frame(AVCodecContext *avctx, f->pict_type = AV_PICTURE_TYPE_I; f->key_frame = 1; - avctx->pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; + avctx->pix_fmt = version & 1 ? is_pal ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; avctx->color_range = version & 1 ? AVCOL_RANGE_UNSPECIFIED : AVCOL_RANGE_JPEG; avctx->colorspace = version & 1 ? AVCOL_SPC_UNSPECIFIED : AVCOL_SPC_BT709; @@ -245,11 +256,25 @@ static int decode_frame(AVCodecContext *avctx, break; case 1: + if (is_pal) { + uint32_t *pal = (uint32_t *)f->data[1]; + + for (y = 0; y < 256; y++) { + pal[y] = AV_RL32(buf) | 0xFF000000; + buf += 4; + } + + for (y = 0; y <avctx->height; y++) + memcpy(&f->data[0][y * f->linesize[0]], + &buf[y * avctx->width], + avctx->width); + } else { /* Fraps v1 is an upside-down BGR24 */ 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: |