generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid the last two uses of bitmasks in interplayvideo

Browse Source 
Originally committed as revision 18272 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-03-31 14:48:14 +00:00
parent 3f300d7e25
commit f02bd7e49c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/interplayvideo.c
View File

@@ -212,9 +212,9 @@ static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s)
CHECK_STREAM_PTR(8); CHECK_STREAM_PTR(8);
for (y = 0; y < 8; y++) { for (y = 0; y < 8; y++) {
flags = *s->stream_ptr++; flags = *s->stream_ptr++ | 0x100;
for (x = 0x01; x <= 0x80; x <<= 1) { for (; flags != 1; flags >>= 1) {
*s->pixel_ptr++ = P[!!(flags & x)]; *s->pixel_ptr++ = P[flags & 1];
} }
s->pixel_ptr += s->line_inc; s->pixel_ptr += s->line_inc;
} }
@@ -354,17 +354,15 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s)
/* horizontal split; top & bottom halves are 2-color encoded */ /* horizontal split; top & bottom halves are 2-color encoded */
for (y = 0; y < 8; y++) { for (y = 0; y < 8; y++) {
int bitmask;
if (y == 4) { if (y == 4) {
P[0] = *s->stream_ptr++; P[0] = *s->stream_ptr++;
P[1] = *s->stream_ptr++; P[1] = *s->stream_ptr++;
} }
flags = *s->stream_ptr++; flags = *s->stream_ptr++ | 0x100;
for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) { for (; flags != 1; flags >>= 1) {
*s->pixel_ptr++ = P[!!(flags & bitmask)]; *s->pixel_ptr++ = P[flags & 1];
} }
s->pixel_ptr += s->line_inc; s->pixel_ptr += s->line_inc;
} }