Skip to content
Snippets Groups Projects
Commit ae1374ce authored by Diego Biurrun's avatar Diego Biurrun
Browse files

cosmetics: Prettyprint and reformat wma.c closer to K&R style. 

Originally committed as revision 19165 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 761c8c92
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 43 deletions
libavcodec/wma.c
+ 44
− 43
View file @ ae1374ce
...@@ -28,41 +28,41 @@ ...@@ -28,41 +28,41 @@
/* XXX: use same run/length optimization as mpeg decoders */ /* XXX: use same run/length optimization as mpeg decoders */
//FIXME maybe split decode / encode or pass flag //FIXME maybe split decode / encode or pass flag
static void init_coef_vlc(VLC *vlc, static void init_coef_vlc(VLC *vlc, uint16_t **prun_table,
uint16_t **prun_table, uint16_t **plevel_table, uint16_t **pint_table, uint16_t **plevel_table, uint16_t **pint_table,
const CoefVLCTable *vlc_table) const CoefVLCTable *vlc_table)
{ {
int n = vlc_table->n; int n = vlc_table->n;
const uint8_t *table_bits = vlc_table->huffbits; const uint8_t *table_bits = vlc_table->huffbits;
const uint32_t *table_codes = vlc_table->huffcodes; const uint32_t *table_codes = vlc_table->huffcodes;
const uint16_t *levels_table = vlc_table->levels; const uint16_t *levels_table = vlc_table->levels;
uint16_t *run_table, *level_table, *int_table; uint16_t *run_table, *level_table, *int_table;
int i, l, j, k, level; int i, l, j, k, level;
init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0);
run_table = av_malloc(n * sizeof(uint16_t)); run_table = av_malloc(n * sizeof(uint16_t));
level_table = av_malloc(n * sizeof(uint16_t)); level_table = av_malloc(n * sizeof(uint16_t));
int_table = av_malloc(n * sizeof(uint16_t)); int_table = av_malloc(n * sizeof(uint16_t));
i = 2; i = 2;
level = 1; level = 1;
k = 0; k = 0;
while (i < n) { while (i < n) {
int_table[k]= i; int_table[k] = i;
l = levels_table[k++]; l = levels_table[k++];
for(j=0;j<l;j++) { for (j = 0; j < l; j++) {
run_table[i] = j; run_table[i] = j;
level_table[i] = level; level_table[i] = level;
i++; i++;
} }
level++; level++;
} }
*prun_table = run_table; *prun_table = run_table;
*plevel_table = level_table; *plevel_table = level_table;
*pint_table= int_table; *pint_table = int_table;
} }
int ff_wma_init(AVCodecContext * avctx, int flags2) int ff_wma_init(AVCodecContext *avctx, int flags2)
{ {
WMACodecContext *s = avctx->priv_data; WMACodecContext *s = avctx->priv_data;
int i; int i;
...@@ -71,14 +71,14 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -71,14 +71,14 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
int sample_rate1; int sample_rate1;
int coef_vlc_table; int coef_vlc_table;
if( avctx->sample_rate<=0 || avctx->sample_rate>50000 if ( avctx->sample_rate <= 0 || avctx->sample_rate > 50000
|| avctx->channels<=0 || avctx->channels>8 || avctx->channels <= 0 || avctx->channels > 8
|| avctx->bit_rate<=0) || avctx->bit_rate <= 0)
return -1; return -1;
s->sample_rate = avctx->sample_rate; s->sample_rate = avctx->sample_rate;
s->nb_channels = avctx->channels; s->nb_channels = avctx->channels;
s->bit_rate = avctx->bit_rate; s->bit_rate = avctx->bit_rate;
s->block_align = avctx->block_align; s->block_align = avctx->block_align;
dsputil_init(&s->dsp, avctx); dsputil_init(&s->dsp, avctx);
...@@ -92,7 +92,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -92,7 +92,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
/* compute MDCT block size */ /* compute MDCT block size */
if (s->sample_rate <= 16000) { if (s->sample_rate <= 16000) {
s->frame_len_bits = 9; s->frame_len_bits = 9;
} else if (s->sample_rate <= 22050 || } else if ( s->sample_rate <= 22050 ||
(s->sample_rate <= 32000 && s->version == 1)) { (s->sample_rate <= 32000 && s->version == 1)) {
s->frame_len_bits = 10; s->frame_len_bits = 10;
} else { } else {
...@@ -177,12 +177,12 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -177,12 +177,12 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
} }
dprintf(s->avctx, "flags2=0x%x\n", flags2); dprintf(s->avctx, "flags2=0x%x\n", flags2);
dprintf(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n", dprintf(s->avctx, "version=%d channels=%d sample_rate=%d bitrate=%d block_align=%d\n",
s->version, s->nb_channels, s->sample_rate, s->bit_rate, s->version, s->nb_channels, s->sample_rate, s->bit_rate,
s->block_align); s->block_align);
dprintf(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n", dprintf(s->avctx, "bps=%f bps1=%f high_freq=%f bitoffset=%d\n",
bps, bps1, high_freq, s->byte_offset_bits); bps, bps1, high_freq, s->byte_offset_bits);
dprintf(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n", dprintf(s->avctx, "use_noise_coding=%d use_exp_vlc=%d nb_block_sizes=%d\n",
s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes); s->use_noise_coding, s->use_exp_vlc, s->nb_block_sizes);
/* compute the scale factor band sizes for each MDCT block size */ /* compute the scale factor band sizes for each MDCT block size */
{ {
...@@ -194,15 +194,15 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -194,15 +194,15 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
} else { } else {
s->coefs_start = 0; s->coefs_start = 0;
} }
for(k = 0; k < s->nb_block_sizes; k++) { for (k = 0; k < s->nb_block_sizes; k++) {
block_len = s->frame_len >> k; block_len = s->frame_len >> k;
if (s->version == 1) { if (s->version == 1) {
lpos = 0; lpos = 0;
for(i=0;i<25;i++) { for (i = 0; i < 25; i++) {
a = wma_critical_freqs[i]; a = wma_critical_freqs[i];
b = s->sample_rate; b = s->sample_rate;
pos = ((block_len * 2 * a) + (b >> 1)) / b; pos = ((block_len * 2 * a) + (b >> 1)) / b;
if (pos > block_len) if (pos > block_len)
pos = block_len; pos = block_len;
s->exponent_bands[0][i] = pos - lpos; s->exponent_bands[0][i] = pos - lpos;
...@@ -227,16 +227,16 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -227,16 +227,16 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
} }
if (table) { if (table) {
n = *table++; n = *table++;
for(i=0;i<n;i++) for (i = 0; i < n; i++)
s->exponent_bands[k][i] = table[i]; s->exponent_bands[k][i] = table[i];
s->exponent_sizes[k] = n; s->exponent_sizes[k] = n;
} else { } else {
j = 0; j = 0;
lpos = 0; lpos = 0;
for(i=0;i<25;i++) { for (i = 0; i < 25; i++) {
a = wma_critical_freqs[i]; a = wma_critical_freqs[i];
b = s->sample_rate; b = s->sample_rate;
pos = ((block_len * 2 * a) + (b << 1)) / (4 * b); pos = ((block_len * 2 * a) + (b << 1)) / (4 * b);
pos <<= 2; pos <<= 2;
if (pos > block_len) if (pos > block_len)
pos = block_len; pos = block_len;
...@@ -258,7 +258,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -258,7 +258,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
n = s->exponent_sizes[k]; n = s->exponent_sizes[k];
j = 0; j = 0;
pos = 0; pos = 0;
for(i=0;i<n;i++) { for (i = 0; i < n; i++) {
int start, end; int start, end;
start = pos; start = pos;
pos += s->exponent_bands[k][i]; pos += s->exponent_bands[k][i];
...@@ -273,11 +273,11 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -273,11 +273,11 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
s->exponent_high_sizes[k] = j; s->exponent_high_sizes[k] = j;
#if 0 #if 0
tprintf(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ", tprintf(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ",
s->frame_len >> k, s->frame_len >> k,
s->coefs_end[k], s->coefs_end[k],
s->high_band_start[k], s->high_band_start[k],
s->exponent_high_sizes[k]); s->exponent_high_sizes[k]);
for(j=0;j<s->exponent_high_sizes[k];j++) for (j = 0; j < s->exponent_high_sizes[k]; j++)
tprintf(s->avctx, " %d", s->exponent_high_bands[k][j]); tprintf(s->avctx, " %d", s->exponent_high_bands[k][j]);
tprintf(s->avctx, "\n"); tprintf(s->avctx, "\n");
#endif #endif
...@@ -287,11 +287,11 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -287,11 +287,11 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
#ifdef TRACE #ifdef TRACE
{ {
int i, j; int i, j;
for(i = 0; i < s->nb_block_sizes; i++) { for (i = 0; i < s->nb_block_sizes; i++) {
tprintf(s->avctx, "%5d: n=%2d:", tprintf(s->avctx, "%5d: n=%2d:",
s->frame_len >> i, s->frame_len >> i,
s->exponent_sizes[i]); s->exponent_sizes[i]);
for(j=0;j<s->exponent_sizes[i];j++) for (j = 0; j < s->exponent_sizes[i]; j++)
tprintf(s->avctx, " %d", s->exponent_bands[i][j]); tprintf(s->avctx, " %d", s->exponent_bands[i][j]);
tprintf(s->avctx, "\n"); tprintf(s->avctx, "\n");
} }
...@@ -299,7 +299,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -299,7 +299,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
#endif #endif
/* init MDCT windows : simple sinus window */ /* init MDCT windows : simple sinus window */
for(i = 0; i < s->nb_block_sizes; i++) { for (i = 0; i < s->nb_block_sizes; i++) {
int n; int n;
n = 1 << (s->frame_len_bits - i); n = 1 << (s->frame_len_bits - i);
ff_sine_window_init(ff_sine_windows[s->frame_len_bits - i - 7], n); ff_sine_window_init(ff_sine_windows[s->frame_len_bits - i - 7], n);
...@@ -317,7 +317,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -317,7 +317,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
s->noise_mult = 0.04; s->noise_mult = 0.04;
#ifdef TRACE #ifdef TRACE
for(i=0;i<NOISE_TAB_SIZE;i++) for (i = 0; i < NOISE_TAB_SIZE; i++)
s->noise_table[i] = 1.0 * s->noise_mult; s->noise_table[i] = 1.0 * s->noise_mult;
#else #else
{ {
...@@ -325,7 +325,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -325,7 +325,7 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
float norm; float norm;
seed = 1; seed = 1;
norm = (1.0 / (float)(1LL << 31)) * sqrt(3) * s->noise_mult; norm = (1.0 / (float)(1LL << 31)) * sqrt(3) * s->noise_mult;
for(i=0;i<NOISE_TAB_SIZE;i++) { for (i = 0; i < NOISE_TAB_SIZE; i++) {
seed = seed * 314159 + 1; seed = seed * 314159 + 1;
s->noise_table[i] = (float)((int)seed) * norm; s->noise_table[i] = (float)((int)seed) * norm;
} }
...@@ -351,7 +351,8 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) ...@@ -351,7 +351,8 @@ int ff_wma_init(AVCodecContext * avctx, int flags2)
return 0; return 0;
} }
int ff_wma_total_gain_to_bits(int total_gain){ int ff_wma_total_gain_to_bits(int total_gain)
{
if (total_gain < 15) return 13; if (total_gain < 15) return 13;
else if (total_gain < 32) return 12; else if (total_gain < 32) return 12;
else if (total_gain < 40) return 11; else if (total_gain < 40) return 11;
...@@ -364,7 +365,7 @@ int ff_wma_end(AVCodecContext *avctx) ...@@ -364,7 +365,7 @@ int ff_wma_end(AVCodecContext *avctx)
WMACodecContext *s = avctx->priv_data; WMACodecContext *s = avctx->priv_data;
int i; int i;
for(i = 0; i < s->nb_block_sizes; i++) for (i = 0; i < s->nb_block_sizes; i++)
ff_mdct_end(&s->mdct_ctx[i]); ff_mdct_end(&s->mdct_ctx[i]);
if (s->use_exp_vlc) { if (s->use_exp_vlc) {
...@@ -373,7 +374,7 @@ int ff_wma_end(AVCodecContext *avctx) ...@@ -373,7 +374,7 @@ int ff_wma_end(AVCodecContext *avctx)
if (s->use_noise_coding) { if (s->use_noise_coding) {
free_vlc(&s->hgain_vlc); free_vlc(&s->hgain_vlc);
} }
for(i = 0;i < 2; i++) { for (i = 0; i < 2; i++) {
free_vlc(&s->coef_vlc[i]); free_vlc(&s->coef_vlc[i]);
av_free(s->run_table[i]); av_free(s->run_table[i]);
av_free(s->level_table[i]); av_free(s->level_table[i]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment