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

Use bytestream_get_be24 to simplify palette parsing.

Browse Source 
Originally committed as revision 11821 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-02-02 22:31:11 +00:00
parent 04deea9ad2
commit 3e368d726a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/smacker.c
View File

@ -35,6 +35,7 @@
#define ALT_BITSTREAM_READER_LE
#include "bitstream.h"
#include "bytestream.h"
#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000
@ -367,7 +368,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
}
/* make the palette available on the way out */
out = buf + 1;
pal = (uint32_t*)smk->pic.data[1];
smk->pic.palette_has_changed = buf[0] & 1;
smk->pic.key_frame = !!(buf[0] & 2);
@ -376,19 +376,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
else
smk->pic.pict_type = FF_P_TYPE;
for(i = 0; i < 256; i++) {
int r, g, b;
r = *out++;
g = *out++;
b = *out++;
*pal++ = (r << 16) | (g << 8) | b;
}
buf++;
for(i = 0; i < 256; i++)
*pal++ = bytestream_get_be24(&buf);
buf_size -= 769;
last_reset(smk->mmap_tbl, smk->mmap_last);
last_reset(smk->mclr_tbl, smk->mclr_last);
last_reset(smk->full_tbl, smk->full_last);
last_reset(smk->type_tbl, smk->type_last);
init_get_bits(&gb, buf + 769, (buf_size - 769) * 8);
init_get_bits(&gb, buf, buf_size * 8);
blk = 0;
bw = avctx->width >> 2;