virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lagarith: refactor code

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Paul B Mahol 2012-02-08 17:35:47 +00:00 committed by Michael Niedermayer
parent 1aa8f5fcfb
commit 3c939ad6e0
1 changed files with 22 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libavcodec/lagarith.c
View File

@ -447,7 +447,7 @@ static int lag_decode_frame(AVCodecContext *avctx,
uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9; uint32_t offset_gu = 0, offset_bv = 0, offset_ry = 9;
int offs[4]; int offs[4];
uint8_t *srcs[4], *dst; uint8_t *srcs[4], *dst;
int i, j; int i, j, planes = 3;
AVFrame *picture = data; AVFrame *picture = data;
@ -480,33 +480,39 @@ static int lag_decode_frame(AVCodecContext *avctx,
break; break;
case FRAME_ARITH_RGBA: case FRAME_ARITH_RGBA:
avctx->pix_fmt = PIX_FMT_RGB32; 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) { if (avctx->get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
offs[0] = offset_bv; offs[0] = offset_bv;
offs[1] = offset_gu; offs[1] = offset_gu;
offs[2] = 13; offs[2] = offset_ry;
offs[3] = AV_RL32(buf + 9);
if (!l->rgb_planes) { if (!l->rgb_planes) {
l->rgb_stride = FFALIGN(avctx->width, 16); 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) { if (!l->rgb_planes) {
av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n"); av_log(avctx, AV_LOG_ERROR, "cannot allocate temporary buffer\n");
return AVERROR(ENOMEM); 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; 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], lag_decode_arith_plane(l, srcs[i],
avctx->width, avctx->height, avctx->width, avctx->height,
-l->rgb_stride, buf + offs[i], -l->rgb_stride, buf + offs[i],
buf_size); buf_size);
dst = p->data[0]; 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; srcs[i] = l->rgb_planes + i * l->rgb_stride * avctx->height;
for (j = 0; j < avctx->height; j++) { for (j = 0; j < avctx->height; j++) {
for (i = 0; i < avctx->width; i++) { for (i = 0; i < avctx->width; i++) {
@ -514,57 +520,19 @@ static int lag_decode_frame(AVCodecContext *avctx,
r = srcs[0][i]; r = srcs[0][i];
g = srcs[1][i]; g = srcs[1][i];
b = srcs[2][i]; b = srcs[2][i];
a = srcs[3][i];
r += g; r += g;
b += 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]; dst += p->linesize[0];
for (i = 0; i < 4; i++) for (i = 0; i < planes; i++)
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; srcs[i] += l->rgb_stride;
} }
break; break;