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

opusenc: remove unused header entries and simplify normalization 

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2017-04-03 13:13:14 +01:00
parent a66121d964
commit 63744d8afd
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/opus_celt.h
View File

@ -67,9 +67,6 @@ typedef struct CeltBlock {
uint8_t collapse_masks[CELT_MAX_BANDS];
int band_bins[CELT_MAX_BANDS]; /* MDCT bins per band */
float *band_coeffs[CELT_MAX_BANDS];
/* buffer for mdct output + postfilter */
DECLARE_ALIGNED(32, float, buf)[2048];
DECLARE_ALIGNED(32, float, coeffs)[CELT_MAX_FRAME_SIZE];

18
libavcodec/opusenc.c
View File

@ -255,24 +255,20 @@ static int celt_frame_map_norm_bands(OpusEncContext *s, CeltFrame *f)
for (ch = 0; ch < f->channels; ch++) {
CeltBlock *block = &f->block[ch];
float *start = block->coeffs;
for (i = 0; i < CELT_MAX_BANDS; i++) {
float ener = 0.0f;
int band_offset = ff_celt_freq_bands[i] << f->size;
int band_size = ff_celt_freq_range[i] << f->size;
float *coeffs = &block->coeffs[band_offset];
/* Calculate band bins */
block->band_bins[i] = ff_celt_freq_range[i] << f->size;
block->band_coeffs[i] = start;
start += block->band_bins[i];
/* Normalize band energy */
for (j = 0; j < block->band_bins[i]; j++)
ener += block->band_coeffs[i][j]*block->band_coeffs[i][j];
for (j = 0; j < band_size; j++)
ener += coeffs[j]*coeffs[j];
block->lin_energy[i] = sqrtf(ener) + FLT_EPSILON;
ener = 1.0f/block->lin_energy[i];
for (j = 0; j < block->band_bins[i]; j++)
block->band_coeffs[i][j] *= ener;
for (j = 0; j < band_size; j++)
coeffs[j] *= ener;
block->energy[i] = log2f(block->lin_energy[i]) - ff_celt_mean_energy[i];