comparison interplayvideo.c @ 9307:851ca5db8327 libavcodec

Avoid the last two uses of bitmasks in interplayvideo

9306:7a546836b61b

        /* need 8 more bytes from the stream */
        CHECK_STREAM_PTR(8);

        for (y = 0; y < 8; y++) {
            flags = *s->stream_ptr++;
            for (x = 0x01; x <= 0x80; x <<= 1) {
                *s->pixel_ptr++ = P[!!(flags & x)];
            }
            s->pixel_ptr += s->line_inc;
        }

    } else {

        } else {

            /* horizontal split; top & bottom halves are 2-color encoded */

            for (y = 0; y < 8; y++) {
                int bitmask;

                if (y == 4) {
                    P[0] = *s->stream_ptr++;
                    P[1] = *s->stream_ptr++;
                }
                flags = *s->stream_ptr++;

                for (bitmask = 0x01; bitmask <= 0x80; bitmask <<= 1) {

                    *s->pixel_ptr++ = P[!!(flags & bitmask)];
                }
                s->pixel_ptr += s->line_inc;
            }
        }
    }

9307:851ca5db8327

        /* need 8 more bytes from the stream */
        CHECK_STREAM_PTR(8);

        for (y = 0; y < 8; y++) {
            flags = *s->stream_ptr++ | 0x100;
            for (; flags != 1; flags >>= 1) {
                *s->pixel_ptr++ = P[flags & 1];
            }
            s->pixel_ptr += s->line_inc;
        }

    } else {

        } else {

            /* horizontal split; top & bottom halves are 2-color encoded */

            for (y = 0; y < 8; y++) {
                if (y == 4) {
                    P[0] = *s->stream_ptr++;
                    P[1] = *s->stream_ptr++;
                }
                flags = *s->stream_ptr++ | 0x100;

                for (; flags != 1; flags >>= 1) {

                    *s->pixel_ptr++ = P[flags & 1];
                }
                s->pixel_ptr += s->line_inc;
            }
        }
    }