RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

qtrle: simplify 32-bit decode using intreadwrite macros 

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-11-25 18:16:44 +00:00
parent 3bd1162a52
commit 93c286e54f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/qtrle.c
View File

@ -328,7 +328,6 @@ static void qtrle_decode_32bpp(QtrleContext *s, int stream_ptr, int row_ptr, int
int rle_code; int rle_code;
int pixel_ptr; int pixel_ptr;
int row_inc = s->frame.linesize[0]; int row_inc = s->frame.linesize[0];
unsigned char a, r, g, b;
unsigned int argb; unsigned int argb;
unsigned char *rgb = s->frame.data[0]; unsigned char *rgb = s->frame.data[0];
int pixel_limit = s->frame.linesize[0] * s->avctx->height; int pixel_limit = s->frame.linesize[0] * s->avctx->height;
@ -347,16 +346,13 @@ static void qtrle_decode_32bpp(QtrleContext *s, int stream_ptr, int row_ptr, int
/* decode the run length code */ /* decode the run length code */
rle_code = -rle_code; rle_code = -rle_code;
CHECK_STREAM_PTR(4); CHECK_STREAM_PTR(4);
a = s->buf[stream_ptr++]; argb = AV_RB32(s->buf + stream_ptr);
r = s->buf[stream_ptr++]; stream_ptr += 4;
g = s->buf[stream_ptr++];
b = s->buf[stream_ptr++];
argb = (a << 24) | (r << 16) | (g << 8) | (b << 0);
CHECK_PIXEL_PTR(rle_code * 4); CHECK_PIXEL_PTR(rle_code * 4);
while (rle_code--) { while (rle_code--) {
*(unsigned int *)(&rgb[pixel_ptr]) = argb; AV_WN32A(rgb + pixel_ptr, argb);
pixel_ptr += 4; pixel_ptr += 4;
} }
} else { } else {
@ -365,13 +361,10 @@ static void qtrle_decode_32bpp(QtrleContext *s, int stream_ptr, int row_ptr, int
/* copy pixels directly to output */ /* copy pixels directly to output */
while (rle_code--) { while (rle_code--) {
a = s->buf[stream_ptr++]; argb = AV_RB32(s->buf + stream_ptr);
r = s->buf[stream_ptr++]; AV_WN32A(rgb + pixel_ptr, argb);
g = s->buf[stream_ptr++]; stream_ptr += 4;
b = s->buf[stream_ptr++]; pixel_ptr += 4;
argb = (a << 24) | (r << 16) | (g << 8) | (b << 0);
*(unsigned int *)(&rgb[pixel_ptr]) = argb;
pixel_ptr += 4;
} }
} }
} }