Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

binkaudio: perform band table scaling in decode_init

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
oldabi
Peter Ross 14 years ago committed by Ronald S. Bultje
parent f0ca29eb5f
commit 582ac86d19
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavcodec/binkaudio.c

10
libavcodec/binkaudio.c
Unescape View File

@ -114,10 +114,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
/* populate bands data */ /* populate bands data */
s->bands[0] = 1; s->bands[0] = 2;
for (i = 1; i < s->num_bands; i++) for (i = 1; i < s->num_bands; i++)
s->bands[i] = ff_wma_critical_freqs[i - 1] * (s->frame_len / 2) / sample_rate_half; s->bands[i] = (ff_wma_critical_freqs[i - 1] * s->frame_len / sample_rate_half) & ~1;
s->bands[s->num_bands] = s->frame_len / 2; s->bands[s->num_bands] = s->frame_len;
s->first = 1; s->first = 1;
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
@ -194,11 +194,11 @@ static void decode_block(BinkAudioContext *s, short *out, int use_dct)
if (width == 0) { if (width == 0) {
memset(coeffs + i, 0, (j - i) * sizeof(*coeffs)); memset(coeffs + i, 0, (j - i) * sizeof(*coeffs));
i = j; i = j;
while (s->bands[k] * 2 < i) while (s->bands[k] < i)
q = quant[k++]; q = quant[k++];
} else { } else {
while (i < j) { while (i < j) {
if (s->bands[k] * 2 == i) if (s->bands[k] == i)
q = quant[k++]; q = quant[k++];
coeff = get_bits(gb, width); coeff = get_bits(gb, width);
if (coeff) { if (coeff) {

Write Preview
Loading…
Cancel
Save