virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

correctly deal with the alpha channel in 32-bit QT RLE (courtesy of John

Browse Source 
Koleszar <jkoleszar at on2.com>)

Originally committed as revision 4743 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Melanson 2005-12-14 08:02:03 +00:00
parent 0c3ee78f91
commit e84a047525
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/qtrle.c
View File

@ -411,7 +411,7 @@ static void qtrle_decode_32bpp(QtrleContext *s)
int rle_code; int rle_code;
int row_ptr, pixel_ptr; int row_ptr, pixel_ptr;
int row_inc = s->frame.linesize[0]; int row_inc = s->frame.linesize[0];
unsigned char r, g, b; 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;
@ -455,11 +455,11 @@ static void qtrle_decode_32bpp(QtrleContext *s)
/* 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);
stream_ptr++; /* skip the alpha (?) byte */ a = s->buf[stream_ptr++];
r = s->buf[stream_ptr++]; r = s->buf[stream_ptr++];
g = s->buf[stream_ptr++]; g = s->buf[stream_ptr++];
b = s->buf[stream_ptr++]; b = s->buf[stream_ptr++];
argb = (r << 16) | (g << 8) | (b << 0); argb = (a << 24) | (r << 16) | (g << 8) | (b << 0);
CHECK_PIXEL_PTR(rle_code * 4); CHECK_PIXEL_PTR(rle_code * 4);
@ -473,11 +473,11 @@ static void qtrle_decode_32bpp(QtrleContext *s)
/* copy pixels directly to output */ /* copy pixels directly to output */
while (rle_code--) { while (rle_code--) {
stream_ptr++; /* skip the alpha (?) byte */ a = s->buf[stream_ptr++];
r = s->buf[stream_ptr++]; r = s->buf[stream_ptr++];
g = s->buf[stream_ptr++]; g = s->buf[stream_ptr++];
b = s->buf[stream_ptr++]; b = s->buf[stream_ptr++];
argb = (r << 16) | (g << 8) | (b << 0); argb = (a << 24) | (r << 16) | (g << 8) | (b << 0);
*(unsigned int *)(&rgb[pixel_ptr]) = argb; *(unsigned int *)(&rgb[pixel_ptr]) = argb;
pixel_ptr += 4; pixel_ptr += 4;
} }