diff options
author | Thad Ward <coderjoe69@yahoo.com> | 2011-12-27 23:45:55 -0600 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-12-29 07:37:33 +0100 |
commit | 7af507ea9949ff3189d6d8b20ff01253c944de34 (patch) | |
tree | 900dc54e05cd42a5df3f77106df9b6f8145c8957 /libavcodec | |
parent | 8f5216905f88510c9a74cd91a424902aa989b9a1 (diff) | |
download | ffmpeg-streaming-7af507ea9949ff3189d6d8b20ff01253c944de34.zip ffmpeg-streaming-7af507ea9949ff3189d6d8b20ff01253c944de34.tar.gz |
lagarith: add decode support for arith rgb24 mode
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/lagarith.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 1aa9ec3..757873e 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -447,7 +447,7 @@ static int lag_decode_frame(AVCodecContext *avctx, uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9; int offs[4]; uint8_t *srcs[4], *dst; - int i, j; + int i, j, planes = 3; AVFrame *picture = data; @@ -480,33 +480,39 @@ static int lag_decode_frame(AVCodecContext *avctx, break; case FRAME_ARITH_RGBA: avctx->pix_fmt = PIX_FMT_RGB32; + planes = 4; + offset_ry += 4; + offs[3] = AV_RL32(buf + 9); + case FRAME_ARITH_RGB24: + if (frametype == FRAME_ARITH_RGB24) + avctx->pix_fmt = PIX_FMT_RGB24; if (avctx->get_buffer(avctx, p) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } + offs[0] = offset_bv; offs[1] = offset_gu; - offs[2] = 13; - offs[3] = AV_RL32(buf + 9); + offs[2] = offset_ry; if (!l->rgb_planes) { l->rgb_stride = FFALIGN(avctx->width, 16); - l->rgb_planes = av_malloc(l->rgb_stride * avctx->height * 4); + l->rgb_planes = av_malloc(l->rgb_stride * avctx->height * planes); if (!l->rgb_planes) { av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n"); return AVERROR(ENOMEM); } } - for (i = 0; i < 4; i++) + for (i = 0; i < planes; i++) srcs[i] = l->rgb_planes + (i + 1) * l->rgb_stride * avctx->height - l->rgb_stride; - for (i = 0; i < 4; i++) + for (i = 0; i < planes; i++) lag_decode_arith_plane(l, srcs[i], avctx->width, avctx->height, -l->rgb_stride, buf + offs[i], buf_size); dst = p->data[0]; - for (i = 0; i < 4; i++) + for (i = 0; i < planes; i++) srcs[i] = l->rgb_planes + i * l->rgb_stride * avctx->height; for (j = 0; j < avctx->height; j++) { for (i = 0; i < avctx->width; i++) { @@ -514,13 +520,19 @@ static int lag_decode_frame(AVCodecContext *avctx, r = srcs[0][i]; g = srcs[1][i]; b = srcs[2][i]; - a = srcs[3][i]; r += g; b += g; - AV_WN32(dst + i * 4, MKBETAG(a, r, g, b)); + if (frametype == FRAME_ARITH_RGBA) { + a = srcs[3][i]; + AV_WN32(dst + i * 4, MKBETAG(a, r, g, b)); + } else { + dst[i * 3 + 0] = r; + dst[i * 3 + 1] = g; + dst[i * 3 + 2] = b; + } } dst += p->linesize[0]; - for (i = 0; i < 4; i++) + for (i = 0; i < planes; i++) srcs[i] += l->rgb_stride; } break; |