Commit d60f090d authored by Paul B Mahol's avatar Paul B Mahol

avcodec/fraps: add support for PAL8

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent cde007dc
...@@ -146,6 +146,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -146,6 +146,7 @@ static int decode_frame(AVCodecContext *avctx,
uint32_t offs[4]; uint32_t offs[4];
int i, j, ret, is_chroma; int i, j, ret, is_chroma;
const int planes = 3; const int planes = 3;
int is_pal;
uint8_t *out; uint8_t *out;
if (buf_size < 4) { if (buf_size < 4) {
...@@ -155,6 +156,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -155,6 +156,7 @@ static int decode_frame(AVCodecContext *avctx,
header = AV_RL32(buf); header = AV_RL32(buf);
version = header & 0xff; version = header & 0xff;
is_pal = buf[1] == 2 && version == 1;
header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */ header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */
if (version > 5) { if (version > 5) {
...@@ -166,7 +168,16 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -166,7 +168,16 @@ static int decode_frame(AVCodecContext *avctx,
buf += header_size; 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; unsigned needed_size = avctx->width * avctx->height * 3;
if (version == 0) needed_size /= 2; if (version == 0) needed_size /= 2;
needed_size += header_size; needed_size += header_size;
...@@ -209,7 +220,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -209,7 +220,7 @@ static int decode_frame(AVCodecContext *avctx,
f->pict_type = AV_PICTURE_TYPE_I; f->pict_type = AV_PICTURE_TYPE_I;
f->key_frame = 1; 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 avctx->color_range = version & 1 ? AVCOL_RANGE_UNSPECIFIED
: AVCOL_RANGE_JPEG; : AVCOL_RANGE_JPEG;
avctx->colorspace = version & 1 ? AVCOL_SPC_UNSPECIFIED : AVCOL_SPC_BT709; avctx->colorspace = version & 1 ? AVCOL_SPC_UNSPECIFIED : AVCOL_SPC_BT709;
...@@ -245,11 +256,25 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -245,11 +256,25 @@ static int decode_frame(AVCodecContext *avctx,
break; break;
case 1: 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 */ /* Fraps v1 is an upside-down BGR24 */
for (y = 0; y<avctx->height; y++) for (y = 0; y<avctx->height; y++)
memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]], memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]],
&buf[y * avctx->width * 3], &buf[y * avctx->width * 3],
3 * avctx->width); 3 * avctx->width);
}
break; break;
case 2: case 2:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment