Mercurial > libavcodec.hg
comparison wma.c @ 9843:893b27768692 libavcodec
cosmetics: Add brackets between if/else
| author | faust3 |
|---|---|
| date | Fri, 12 Jun 2009 15:48:41 +0000 |
| parents | 32d100ad81a6 |
| children | eb5916527064 |
comparison
equal
deleted
inserted
replaced
| 9842:32d100ad81a6 | 9843:893b27768692 |
|---|---|
| 73 unsigned int decode_flags) | 73 unsigned int decode_flags) |
| 74 { | 74 { |
| 75 | 75 |
| 76 int frame_len_bits; | 76 int frame_len_bits; |
| 77 | 77 |
| 78 if (sample_rate <= 16000) | 78 if (sample_rate <= 16000) { |
| 79 frame_len_bits = 9; | 79 frame_len_bits = 9; |
| 80 else if (sample_rate <= 22050 || | 80 } else if (sample_rate <= 22050 || |
| 81 (sample_rate <= 32000 && version == 1)) | 81 (sample_rate <= 32000 && version == 1)) { |
| 82 frame_len_bits = 10; | 82 frame_len_bits = 10; |
| 83 else if (sample_rate <= 48000) { | 83 } else if (sample_rate <= 48000) { |
| 84 frame_len_bits = 11; | 84 frame_len_bits = 11; |
| 85 } else if (sample_rate <= 96000) { | 85 } else if (sample_rate <= 96000) { |
| 86 frame_len_bits = 12; | 86 frame_len_bits = 12; |
| 87 } else { | 87 } else { |
| 88 frame_len_bits = 13; | 88 frame_len_bits = 13; |
| 151 high_freq = s->sample_rate * 0.5; | 151 high_freq = s->sample_rate * 0.5; |
| 152 | 152 |
| 153 /* if version 2, then the rates are normalized */ | 153 /* if version 2, then the rates are normalized */ |
| 154 sample_rate1 = s->sample_rate; | 154 sample_rate1 = s->sample_rate; |
| 155 if (s->version == 2) { | 155 if (s->version == 2) { |
| 156 if (sample_rate1 >= 44100) | 156 if (sample_rate1 >= 44100) { |
| 157 sample_rate1 = 44100; | 157 sample_rate1 = 44100; |
| 158 else if (sample_rate1 >= 22050) | 158 } else if (sample_rate1 >= 22050) { |
| 159 sample_rate1 = 22050; | 159 sample_rate1 = 22050; |
| 160 else if (sample_rate1 >= 16000) | 160 } else if (sample_rate1 >= 16000) { |
| 161 sample_rate1 = 16000; | 161 sample_rate1 = 16000; |
| 162 else if (sample_rate1 >= 11025) | 162 } else if (sample_rate1 >= 11025) { |
| 163 sample_rate1 = 11025; | 163 sample_rate1 = 11025; |
| 164 else if (sample_rate1 >= 8000) | 164 } else if (sample_rate1 >= 8000) { |
| 165 sample_rate1 = 8000; | 165 sample_rate1 = 8000; |
| 166 } | |
| 166 } | 167 } |
| 167 | 168 |
| 168 bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate); | 169 bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate); |
| 169 s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0 + 0.5)) + 2; | 170 s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0 + 0.5)) + 2; |
| 170 | 171 |
| 172 be activated */ | 173 be activated */ |
| 173 bps1 = bps; | 174 bps1 = bps; |
| 174 if (s->nb_channels == 2) | 175 if (s->nb_channels == 2) |
| 175 bps1 = bps * 1.6; | 176 bps1 = bps * 1.6; |
| 176 if (sample_rate1 == 44100) { | 177 if (sample_rate1 == 44100) { |
| 177 if (bps1 >= 0.61) | 178 if (bps1 >= 0.61) { |
| 178 s->use_noise_coding = 0; | 179 s->use_noise_coding = 0; |
| 179 else | 180 } else { |
| 180 high_freq = high_freq * 0.4; | 181 high_freq = high_freq * 0.4; |
| 182 } | |
| 181 } else if (sample_rate1 == 22050) { | 183 } else if (sample_rate1 == 22050) { |
| 182 if (bps1 >= 1.16) | 184 if (bps1 >= 1.16) { |
| 183 s->use_noise_coding = 0; | 185 s->use_noise_coding = 0; |
| 184 else if (bps1 >= 0.72) | 186 } else if (bps1 >= 0.72) { |
| 185 high_freq = high_freq * 0.7; | 187 high_freq = high_freq * 0.7; |
| 186 else | 188 } else { |
| 187 high_freq = high_freq * 0.6; | 189 high_freq = high_freq * 0.6; |
| 190 } | |
| 188 } else if (sample_rate1 == 16000) { | 191 } else if (sample_rate1 == 16000) { |
| 189 if (bps > 0.5) | 192 if (bps > 0.5) { |
| 190 high_freq = high_freq * 0.5; | 193 high_freq = high_freq * 0.5; |
| 191 else | 194 } else { |
| 192 high_freq = high_freq * 0.3; | 195 high_freq = high_freq * 0.3; |
| 196 } | |
| 193 } else if (sample_rate1 == 11025) { | 197 } else if (sample_rate1 == 11025) { |
| 194 high_freq = high_freq * 0.7; | 198 high_freq = high_freq * 0.7; |
| 195 } else if (sample_rate1 == 8000) { | 199 } else if (sample_rate1 == 8000) { |
| 196 if (bps <= 0.625) { | 200 if (bps <= 0.625) { |
| 197 high_freq = high_freq * 0.5; | 201 high_freq = high_freq * 0.5; |
| 250 } else { | 254 } else { |
| 251 /* hardcoded tables */ | 255 /* hardcoded tables */ |
| 252 table = NULL; | 256 table = NULL; |
| 253 a = s->frame_len_bits - BLOCK_MIN_BITS - k; | 257 a = s->frame_len_bits - BLOCK_MIN_BITS - k; |
| 254 if (a < 3) { | 258 if (a < 3) { |
| 255 if (s->sample_rate >= 44100) | 259 if (s->sample_rate >= 44100) { |
| 256 table = exponent_band_44100[a]; | 260 table = exponent_band_44100[a]; |
| 257 else if (s->sample_rate >= 32000) | 261 } else if (s->sample_rate >= 32000) { |
| 258 table = exponent_band_32000[a]; | 262 table = exponent_band_32000[a]; |
| 259 else if (s->sample_rate >= 22050) | 263 } else if (s->sample_rate >= 22050) { |
| 260 table = exponent_band_22050[a]; | 264 table = exponent_band_22050[a]; |
| 265 } | |
| 261 } | 266 } |
| 262 if (table) { | 267 if (table) { |
| 263 n = *table++; | 268 n = *table++; |
| 264 for (i = 0; i < n; i++) | 269 for (i = 0; i < n; i++) |
| 265 s->exponent_bands[k][i] = table[i]; | 270 s->exponent_bands[k][i] = table[i]; |
| 343 s->reset_block_lengths = 1; | 348 s->reset_block_lengths = 1; |
| 344 | 349 |
| 345 if (s->use_noise_coding) { | 350 if (s->use_noise_coding) { |
| 346 | 351 |
| 347 /* init the noise generator */ | 352 /* init the noise generator */ |
| 348 if (s->use_exp_vlc) | 353 if (s->use_exp_vlc) { |
| 349 s->noise_mult = 0.02; | 354 s->noise_mult = 0.02; |
| 350 else | 355 } else { |
| 351 s->noise_mult = 0.04; | 356 s->noise_mult = 0.04; |
| 357 } | |
| 352 | 358 |
| 353 #ifdef TRACE | 359 #ifdef TRACE |
| 354 for (i = 0; i < NOISE_TAB_SIZE; i++) | 360 for (i = 0; i < NOISE_TAB_SIZE; i++) |
| 355 s->noise_table[i] = 1.0 * s->noise_mult; | 361 s->noise_table[i] = 1.0 * s->noise_mult; |
| 356 #else | 362 #else |
| 368 } | 374 } |
| 369 | 375 |
| 370 /* choose the VLC tables for the coefficients */ | 376 /* choose the VLC tables for the coefficients */ |
| 371 coef_vlc_table = 2; | 377 coef_vlc_table = 2; |
| 372 if (s->sample_rate >= 32000) { | 378 if (s->sample_rate >= 32000) { |
| 373 if (bps1 < 0.72) | 379 if (bps1 < 0.72) { |
| 374 coef_vlc_table = 0; | 380 coef_vlc_table = 0; |
| 375 else if (bps1 < 1.16) | 381 } else if (bps1 < 1.16) { |
| 376 coef_vlc_table = 1; | 382 coef_vlc_table = 1; |
| 383 } | |
| 377 } | 384 } |
| 378 s->coef_vlcs[0]= &coef_vlcs[coef_vlc_table * 2 ]; | 385 s->coef_vlcs[0]= &coef_vlcs[coef_vlc_table * 2 ]; |
| 379 s->coef_vlcs[1]= &coef_vlcs[coef_vlc_table * 2 + 1]; | 386 s->coef_vlcs[1]= &coef_vlcs[coef_vlc_table * 2 + 1]; |
| 380 init_coef_vlc(&s->coef_vlc[0], &s->run_table[0], &s->level_table[0], &s->int_table[0], | 387 init_coef_vlc(&s->coef_vlc[0], &s->run_table[0], &s->level_table[0], &s->int_table[0], |
| 381 s->coef_vlcs[0]); | 388 s->coef_vlcs[0]); |