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

Rearrange how the different cases are checked to reduce the number of

Browse Source 
comparisons and allow further simplifications.

Originally committed as revision 18268 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-03-31 14:04:54 +00:00
parent 168fffdf01
commit 268a618ba6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/interplayvideo.c
View File

@ -386,7 +386,8 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
memcpy(P, s->stream_ptr, 4); memcpy(P, s->stream_ptr, 4);
s->stream_ptr += 4; s->stream_ptr += 4;
if ((P[0] <= P[1]) && (P[2] <= P[3])) { if (P[0] <= P[1]) {
if (P[2] <= P[3]) {
/* 1 of 4 colors for each pixel, need 16 more bytes */ /* 1 of 4 colors for each pixel, need 16 more bytes */
CHECK_STREAM_PTR(16); CHECK_STREAM_PTR(16);
@ -400,7 +401,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
s->pixel_ptr += s->line_inc; s->pixel_ptr += s->line_inc;
} }
} else if ((P[0] <= P[1]) && (P[2] > P[3])) { } else {
uint32_t flags; uint32_t flags;
/* 1 of 4 colors for each 2x2 block, need 4 more bytes */ /* 1 of 4 colors for each 2x2 block, need 4 more bytes */
@ -418,7 +419,9 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
s->pixel_ptr += s->stride * 2; s->pixel_ptr += s->stride * 2;
} }
} else if ((P[0] > P[1]) && (P[2] <= P[3])) { }
} else {
if (P[2] <= P[3]) {
uint64_t flags; uint64_t flags;
/* 1 of 4 colors for each 2x1 block, need 8 more bytes */ /* 1 of 4 colors for each 2x1 block, need 8 more bytes */
@ -432,8 +435,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
} }
s->pixel_ptr += s->stride; s->pixel_ptr += s->stride;
} }
} else {
} else {
uint64_t flags; uint64_t flags;
/* 1 of 4 colors for each 1x2 block, need 8 more bytes */ /* 1 of 4 colors for each 1x2 block, need 8 more bytes */
@ -447,6 +449,7 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
} }
s->pixel_ptr += s->stride * 2; s->pixel_ptr += s->stride * 2;
} }
}
} }
/* report success */ /* report success */