aacpsy: Add energy spread for each band

This commit adds the energy spread to the struct for each band and removes 2 unused fields.
distortion and perceptual_weight were not referenced in any file nor were they set to any value,
so it was safe to remove them. The energy spread is currently only used in the aac psy model.
It's defined as being proportional to the tonality of each band.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/227/head
Rostislav Pehlivanov 10 years ago committed by Michael Niedermayer
parent a57ee6cca1
commit 02dbed6e71
  1. 1
      libavcodec/aacpsy.c
  2. 3
      libavcodec/psymodel.h

@ -787,6 +787,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel,
psy_band->threshold = band->thr; psy_band->threshold = band->thr;
psy_band->energy = band->energy; psy_band->energy = band->energy;
psy_band->spread = spread_en[w+g];
} }
} }

@ -38,8 +38,7 @@ typedef struct FFPsyBand {
int bits; int bits;
float energy; float energy;
float threshold; float threshold;
float distortion; float spread; /* Energy spread over the band */
float perceptual_weight;
} FFPsyBand; } FFPsyBand;
/** /**

Loading…
Cancel
Save