virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

simplify

Browse Source 
Originally committed as revision 4144 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-04-20 10:16:19 +00:00
parent ee572c5482
commit 8b39f75b8f
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/indeo2.c
View File

@ -40,18 +40,8 @@ static VLC ir2_vlc;
/* Indeo 2 codes are in range 0x01..0x7F and 0x81..0x90 */ /* Indeo 2 codes are in range 0x01..0x7F and 0x81..0x90 */
static inline int ir2_get_code(GetBitContext *gb) static inline int ir2_get_code(GetBitContext *gb)
{ {
int code; return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
code = get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
if (code >= 0x80)
return (code + 1);
return code;
} }
#define CLAMP_TO_BYTE(value) \
if (value > 255) \
value = 255; \
else if (value < 0) \
value = 0; \
static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride, static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
const uint8_t *table) const uint8_t *table)
@ -68,8 +58,8 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
/* first line contain absolute values, other lines contain deltas */ /* first line contain absolute values, other lines contain deltas */
while (out < width){ while (out < width){
c = ir2_get_code(&ctx->gb); c = ir2_get_code(&ctx->gb);
if(c > 0x80) { /* we have a run */ if(c >= 0x80) { /* we have a run */
c -= 0x80; c -= 0x7F;
if(out + c*2 > width) if(out + c*2 > width)
return -1; return -1;
for (i = 0; i < c * 2; i++) for (i = 0; i < c * 2; i++)
@ -85,8 +75,8 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
out = 0; out = 0;
while (out < width){ while (out < width){
c = ir2_get_code(&ctx->gb); c = ir2_get_code(&ctx->gb);
if(c > 0x80) { /* we have a skip */ if(c >= 0x80) { /* we have a skip */
c -= 0x80; c -= 0x7F;
if(out + c*2 > width) if(out + c*2 > width)
return -1; return -1;
for (i = 0; i < c * 2; i++) { for (i = 0; i < c * 2; i++) {
@ -95,11 +85,11 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
} }
} else { /* add two deltas from table */ } else { /* add two deltas from table */
t = dst[out - stride] + (table[c * 2] - 128); t = dst[out - stride] + (table[c * 2] - 128);
CLAMP_TO_BYTE(t); t= clip_uint8(t);
dst[out] = t; dst[out] = t;
out++; out++;
t = dst[out - stride] + (table[(c * 2) + 1] - 128); t = dst[out - stride] + (table[(c * 2) + 1] - 128);
CLAMP_TO_BYTE(t); t= clip_uint8(t);
dst[out] = t; dst[out] = t;
out++; out++;
} }
@ -124,16 +114,16 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_
out = 0; out = 0;
while (out < width){ while (out < width){
c = ir2_get_code(&ctx->gb); c = ir2_get_code(&ctx->gb);
if(c > 0x80) { /* we have a skip */ if(c >= 0x80) { /* we have a skip */
c -= 0x80; c -= 0x7F;
out += c * 2; out += c * 2;
} else { /* add two deltas from table */ } else { /* add two deltas from table */
t = dst[out] + (table[c * 2] - 128); t = dst[out] + (table[c * 2] - 128);
CLAMP_TO_BYTE(t); t= clip_uint8(t);
dst[out] = t; dst[out] = t;
out++; out++;
t = dst[out] + (table[(c * 2) + 1] - 128); t = dst[out] + (table[(c * 2) + 1] - 128);
CLAMP_TO_BYTE(t); t= clip_uint8(t);
dst[out] = t; dst[out] = t;
out++; out++;
} }