- color_flags_a = color_flags_b = 0;
- color_flags_a =
- (s->buf[stream_ptr + 0] << 16) |
- ((s->buf[stream_ptr + 1] & 0xF0) << 8) |
- ((s->buf[stream_ptr + 2] & 0xF0) << 4) |
- ((s->buf[stream_ptr + 2] & 0x0F) << 4) |
- ((s->buf[stream_ptr + 3] & 0xF0) >> 4);
- color_flags_b =
- (s->buf[stream_ptr + 4] << 16) |
- ((s->buf[stream_ptr + 5] & 0xF0) << 8) |
- ((s->buf[stream_ptr + 1] & 0x0F) << 8) |
- ((s->buf[stream_ptr + 3] & 0x0F) << 4) |
- (s->buf[stream_ptr + 5] & 0x0F);
- stream_ptr += 6;
+ int val1 = bytestream2_get_be16(&s->gb);
+ int val2 = bytestream2_get_be16(&s->gb);
+ int val3 = bytestream2_get_be16(&s->gb);
+ color_flags_a = ((val1 & 0xFFF0) << 8) | (val2 >> 4);
+ color_flags_b = ((val3 & 0xFFF0) << 8) |
+ ((val1 & 0x0F) << 8) | ((val2 & 0x0F) << 4) | (val3 & 0x0F);