aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-18 00:09:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-03 19:09:20 +0100
commit0c72d6416019b3a4b28837b3ad6d8a24674b6af5 (patch)
tree85c9a5fe1e47e152584218908d2295d9bacc21af
parent1bb565360cd9cb904bb22d0c367f226b3b417d3e (diff)
downloadffmpeg-0c72d6416019b3a4b28837b3ad6d8a24674b6af5.tar.gz
lagarith: rgb24 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0db7b30700118d9d4b3ce0de8b1da94de747669e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/lagarith.c44
1 files changed, 44 insertions, 0 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index bf845f1ffd..43027cff4e 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -524,6 +524,50 @@ static int lag_decode_frame(AVCodecContext *avctx,
srcs[i] += l->rgb_stride;
}
break;
+ case 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] = 9;
+
+ if (!l->rgb_planes) {
+ l->rgb_stride = FFALIGN(avctx->width, 16);
+ l->rgb_planes = av_malloc(l->rgb_stride * avctx->height * 3);
+ if (!l->rgb_planes) {
+ av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n");
+ return AVERROR(ENOMEM);
+ }
+ }
+ for (i = 0; i < 3; i++)
+ srcs[i] = l->rgb_planes + (i + 1) * l->rgb_stride * avctx->height - l->rgb_stride;
+ for (i = 0; i < 3; 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 < 3; 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++) {
+ uint8_t r, g, b;
+ r = srcs[0][i];
+ g = srcs[1][i];
+ b = srcs[2][i];
+ dst[3*i+0] = r+g;
+ dst[3*i+1] = g;
+ dst[3*i+2] = b+g;
+ }
+ dst += p->linesize[0];
+ for (i = 0; i < 3; i++)
+ srcs[i] += l->rgb_stride;
+ }
+ break;
case FRAME_ARITH_YV12:
avctx->pix_fmt = PIX_FMT_YUV420P;