Commit 07f06540 authored by Alexander Strasser's avatar Alexander Strasser Committed by Ronald S. Bultje
Browse files

vorbis dec: Delete useless scopes, and reindent after scope deletion


Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
Signed-off-by: default avatarRonald S. Bultje <rsbultje@gmail.com>
parent f3d09d44
...@@ -594,16 +594,13 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) ...@@ -594,16 +594,13 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
create_map(vc, i); create_map(vc, i);
/* allocate mem for lsp coefficients */ /* codebook dim is for padding if codebook dim doesn't *
{ * divide order+1 then we need to read more data */
/* codebook dim is for padding if codebook dim doesn't * floor_setup->data.t0.lsp =
* divide order+1 then we need to read more data */ av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim)
floor_setup->data.t0.lsp = * sizeof(float));
av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim) if (!floor_setup->data.t0.lsp)
* sizeof(float)); return -1;
if (!floor_setup->data.t0.lsp)
return -1;
}
#ifdef V_DEBUG /* debug output parsed headers */ #ifdef V_DEBUG /* debug output parsed headers */
AV_DEBUG("floor0 order: %u\n", floor_setup->data.t0.order); AV_DEBUG("floor0 order: %u\n", floor_setup->data.t0.order);
...@@ -1110,11 +1107,9 @@ static int vorbis_floor0_decode(vorbis_context *vc, ...@@ -1110,11 +1107,9 @@ static int vorbis_floor0_decode(vorbis_context *vc,
} }
/* calculate linear floor value */ /* calculate linear floor value */
{ q = exp((((amplitude*vf->amplitude_offset) /
q = exp((((amplitude*vf->amplitude_offset) / (((1 << vf->amplitude_bits) - 1) * sqrt(p + q)))
(((1 << vf->amplitude_bits) - 1) * sqrt(p + q))) - vf->amplitude_offset) * .11512925f);
- vf->amplitude_offset) * .11512925f);
}
/* fill vector */ /* fill vector */
do { do {
......
Markdown is supported
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