MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/siren: don't reduce getbitcontext size by checksum_bits at initialisation

Browse Source 
this allows the checksum calculation routine to also use getbitcontext

Signed-off-by: Peter Ross <pross@xvid.org>
This commit is contained in:
Peter Ross 2021-09-18 19:55:22 +10:00
parent b007e8968f
commit e40593c050
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/siren.c
View File

@ -594,7 +594,7 @@ static int decode_vector(SirenContext *s, int number_of_regions,
for (i = 0; i < number_of_vectors[category]; i++) {
index = 0;
do {
if (get_bits_left(gb) <= 0) {
if (get_bits_left(gb) - s->checksum_bits <= 0) {
error = 1;
break;
}
@ -614,7 +614,7 @@ static int decode_vector(SirenContext *s, int number_of_regions,
index >>= index_table[category];
if (decoded_value) {
if (get_bits_left(gb) <= 0) {
if (get_bits_left(gb) - s->checksum_bits <= 0) {
error = 1;
break;
}
@ -697,7 +697,7 @@ static int decode_vector(SirenContext *s, int number_of_regions,
}
}
return error == 1 ? AVERROR_INVALIDDATA : get_bits_left(gb);
return error == 1 ? AVERROR_INVALIDDATA : (get_bits_left(gb) - s->checksum_bits);
}
static int siren_decode(AVCodecContext *avctx, void *data,
@ -716,7 +716,7 @@ static int siren_decode(AVCodecContext *avctx, void *data,
if (avpkt->size < bits_per_frame / 8)
return AVERROR_INVALIDDATA;
if ((ret = init_get_bits(gb, avpkt->data, bits_per_frame - s->checksum_bits)) < 0)
if ((ret = init_get_bits(gb, avpkt->data, bits_per_frame)) < 0)
return ret;
} else
if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0)
@ -730,7 +730,7 @@ static int siren_decode(AVCodecContext *avctx, void *data,
rate_control = get_bits(gb, 4);
ret = categorize_regions(s->number_of_regions, get_bits_left(gb),
ret = categorize_regions(s->number_of_regions, get_bits_left(gb) - s->checksum_bits,
s->absolute_region_power_index, s->power_categories,
s->category_balance);
if (ret < 0)
@ -745,11 +745,11 @@ static int siren_decode(AVCodecContext *avctx, void *data,
if (ret < 0 && !s->microsoft)
return ret;
if (get_bits_left(gb) > 0) {
if (get_bits_left(gb) - s->checksum_bits > 0) {
do {
frame_error |= !get_bits1(gb);
} while (get_bits_left(gb) > 0);
} else if (get_bits_left(gb) < 0 &&
} while (get_bits_left(gb) - s->checksum_bits > 0);
} else if (get_bits_left(gb) - s->checksum_bits < 0 &&
rate_control + 1 < s->rate_control_possibilities) {
frame_error = 1;
}