RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ac3dec: cosmetics 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2015-03-14 11:49:00 +00:00 committed by Michael Niedermayer
parent 0c3339f4bd
commit 73ebbfdff0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ac3dec.c
View File

@ -924,14 +924,13 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
bin = s->spx_src_start_freq; bin = s->spx_src_start_freq;
for (bnd = 0; bnd < s->num_spx_bands; bnd++) { for (bnd = 0; bnd < s->num_spx_bands; bnd++) {
int bandsize; int bandsize = s->spx_band_sizes[bnd];
int spx_coord_exp, spx_coord_mant; int spx_coord_exp, spx_coord_mant;
INTFLOAT nratio, sblend, nblend; INTFLOAT nratio, sblend, nblend;
#if USE_FIXED #if USE_FIXED
int64_t accu;
/* calculate blending factors */ /* calculate blending factors */
bandsize = s->spx_band_sizes[bnd]; int64_t accu = ((bin << 23) + (bandsize << 22))
accu = (int64_t)((bin << 23) + (bandsize << 22)) * s->spx_dst_end_freq; * (int64_t)s->spx_dst_end_freq;
nratio = (int)(accu >> 32); nratio = (int)(accu >> 32);
nratio -= spx_blend << 18; nratio -= spx_blend << 18;
@ -951,7 +950,6 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
float spx_coord; float spx_coord;
/* calculate blending factors */ /* calculate blending factors */
bandsize = s->spx_band_sizes[bnd];
nratio = ((float)((bin + (bandsize >> 1))) / s->spx_dst_end_freq) - spx_blend; nratio = ((float)((bin + (bandsize >> 1))) / s->spx_dst_end_freq) - spx_blend;
nratio = av_clipf(nratio, 0.0f, 1.0f); nratio = av_clipf(nratio, 0.0f, 1.0f);
nblend = sqrtf(3.0f * nratio); // noise is scaled by sqrt(3) nblend = sqrtf(3.0f * nratio); // noise is scaled by sqrt(3)