|
|
@ -53,7 +53,7 @@ if (value > 255) \ |
|
|
|
else if (value < 0) \
|
|
|
|
else if (value < 0) \
|
|
|
|
value = 0; \
|
|
|
|
value = 0; \
|
|
|
|
|
|
|
|
|
|
|
|
static void 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) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int i; |
|
|
|
int i; |
|
|
@ -62,11 +62,16 @@ static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *ds |
|
|
|
int c; |
|
|
|
int c; |
|
|
|
int t; |
|
|
|
int t; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(width&1) |
|
|
|
|
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
|
|
/* 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 -= 0x80; |
|
|
|
|
|
|
|
if(out + c*2 > width) |
|
|
|
|
|
|
|
return -1; |
|
|
|
for (i = 0; i < c * 2; i++) |
|
|
|
for (i = 0; i < c * 2; i++) |
|
|
|
dst[out++] = 0x80; |
|
|
|
dst[out++] = 0x80; |
|
|
|
} else { /* copy two values from table */ |
|
|
|
} else { /* copy two values from table */ |
|
|
@ -82,6 +87,8 @@ static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *ds |
|
|
|
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 -= 0x80; |
|
|
|
|
|
|
|
if(out + c*2 > width) |
|
|
|
|
|
|
|
return -1; |
|
|
|
for (i = 0; i < c * 2; i++) { |
|
|
|
for (i = 0; i < c * 2; i++) { |
|
|
|
dst[out] = dst[out - stride]; |
|
|
|
dst[out] = dst[out - stride]; |
|
|
|
out++; |
|
|
|
out++; |
|
|
@ -99,9 +106,10 @@ static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *ds |
|
|
|
} |
|
|
|
} |
|
|
|
dst += stride; |
|
|
|
dst += stride; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static void ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride, |
|
|
|
static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride, |
|
|
|
const uint8_t *table) |
|
|
|
const uint8_t *table) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int j; |
|
|
|
int j; |
|
|
@ -109,6 +117,9 @@ static void ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8 |
|
|
|
int c; |
|
|
|
int c; |
|
|
|
int t; |
|
|
|
int t; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(width&1) |
|
|
|
|
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < height; j++){ |
|
|
|
for (j = 0; j < height; j++){ |
|
|
|
out = 0; |
|
|
|
out = 0; |
|
|
|
while (out < width){ |
|
|
|
while (out < width){ |
|
|
@ -129,6 +140,7 @@ static void ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8 |
|
|
|
} |
|
|
|
} |
|
|
|
dst += stride; |
|
|
|
dst += stride; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static int ir2_decode_frame(AVCodecContext *avctx,
|
|
|
|
static int ir2_decode_frame(AVCodecContext *avctx,
|
|
|
|