|
|
@ -86,7 +86,12 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) |
|
|
|
if (level == 127) { |
|
|
|
if (level == 127) { |
|
|
|
break; |
|
|
|
break; |
|
|
|
} else if (level != 0) { |
|
|
|
} else if (level != 0) { |
|
|
|
i += run; |
|
|
|
i += run; |
|
|
|
|
|
|
|
if (i > 63) { |
|
|
|
|
|
|
|
av_log(a->avctx, AV_LOG_ERROR, |
|
|
|
|
|
|
|
"ac-tex damaged at %d %d\n", a->mb_x, a->mb_y); |
|
|
|
|
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
} |
|
|
|
j = scantable[i]; |
|
|
|
j = scantable[i]; |
|
|
|
level = (level * qscale * quant_matrix[j]) >> 3; |
|
|
|
level = (level * qscale * quant_matrix[j]) >> 3; |
|
|
|
level = (level ^ SHOW_SBITS(re, &a->gb, 1)) - SHOW_SBITS(re, &a->gb, 1); |
|
|
|
level = (level ^ SHOW_SBITS(re, &a->gb, 1)) - SHOW_SBITS(re, &a->gb, 1); |
|
|
@ -96,8 +101,13 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) |
|
|
|
run = SHOW_UBITS(re, &a->gb, 6)+1; LAST_SKIP_BITS(re, &a->gb, 6); |
|
|
|
run = SHOW_UBITS(re, &a->gb, 6)+1; LAST_SKIP_BITS(re, &a->gb, 6); |
|
|
|
UPDATE_CACHE(re, &a->gb); |
|
|
|
UPDATE_CACHE(re, &a->gb); |
|
|
|
level = SHOW_SBITS(re, &a->gb, 10); SKIP_BITS(re, &a->gb, 10); |
|
|
|
level = SHOW_SBITS(re, &a->gb, 10); SKIP_BITS(re, &a->gb, 10); |
|
|
|
i += run; |
|
|
|
i += run; |
|
|
|
j = scantable[i]; |
|
|
|
if (i > 63) { |
|
|
|
|
|
|
|
av_log(a->avctx, AV_LOG_ERROR, |
|
|
|
|
|
|
|
"ac-tex damaged at %d %d\n", a->mb_x, a->mb_y); |
|
|
|
|
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
j = scantable[i]; |
|
|
|
if (level < 0) { |
|
|
|
if (level < 0) { |
|
|
|
level = -level; |
|
|
|
level = -level; |
|
|
|
level = (level * qscale * quant_matrix[j]) >> 3; |
|
|
|
level = (level * qscale * quant_matrix[j]) >> 3; |
|
|
@ -108,10 +118,6 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) |
|
|
|
level = (level - 1) | 1; |
|
|
|
level = (level - 1) | 1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (i > 63) { |
|
|
|
|
|
|
|
av_log(a->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", a->mb_x, a->mb_y); |
|
|
|
|
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
block[j] = level; |
|
|
|
block[j] = level; |
|
|
|
} |
|
|
|
} |
|
|
|