Mercurial > libavcodec.hg
changeset 4812:d9cff0d54fdd libavcodec
use shorter names for the block type enum
| author | michael |
|---|---|
| date | Sat, 07 Apr 2007 23:10:22 +0000 |
| parents | 2e9455fd2b8c |
| children | a7f058c55491 |
| files | bethsoftvideo.c bethsoftvideo.h |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/bethsoftvideo.c Sat Apr 07 23:02:43 2007 +0000 +++ b/bethsoftvideo.c Sat Apr 07 23:10:22 2007 +0000 @@ -51,7 +51,7 @@ { uint32_t * palette = (uint32_t *)frame->data[1]; int a; - for(a = 0; a < VID_PALETTE_NUMCOLORS; a++) + for(a = 0; a < 256; a++) { palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4; // multiply all colors by 4 } @@ -84,7 +84,7 @@ switch(block_type = *buf++) { case PALETTE_BLOCK: set_palette(&vid->frame, buf); return 0; - case VIDEO_YOFFSET_DIFFERENCE_FRAME_BLOCK: + case VIDEO_YOFF_P_FRAME: yoffset = bytestream_get_le16(&buf); if(yoffset >= avctx->height) { return -1; } destination += vid->frame.linesize[0] * yoffset; @@ -99,7 +99,7 @@ while(length > line_remaining) { if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, line_remaining); } - else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, buf[0], line_remaining); } + else if(block_type == VIDEO_I_FRAME) { memset(destination, buf[0], line_remaining); } length -= line_remaining; // decrement the number of bytes to be copied destination += line_remaining + wrap_to_next_line; // skip over extra bytes at end of frame line_remaining = avctx->width; @@ -108,7 +108,7 @@ // copy any remaining bytes after / if line overflows if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, length); } - else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, *buf++, length); } + else if(block_type == VIDEO_I_FRAME) { memset(destination, *buf++, length); } line_remaining -= length; destination += length; }
--- a/bethsoftvideo.h Sat Apr 07 23:02:43 2007 +0000 +++ b/bethsoftvideo.h Sat Apr 07 23:10:22 2007 +0000 @@ -1,12 +1,10 @@ -#define VID_PALETTE_NUMCOLORS 256 - enum BethsoftVidBlockType { PALETTE_BLOCK = 0x02, FIRST_AUDIO_BLOCK = 0x7c, AUDIO_BLOCK = 0x7d, - VIDEO_FULL_FRAME_BLOCK = 0x03, - VIDEO_DIFFERENCE_FRAME_BLOCK = 0x01, - VIDEO_YOFFSET_DIFFERENCE_FRAME_BLOCK = 0x04, - FINISHED_BLOCK = 0x14, + VIDEO_I_FRAME = 0x03, + VIDEO_P_FRAME = 0x01, + VIDEO_YOFF_P_FRAME = 0x04, + EOF_BLOCK = 0x14, };