Commit 02dbed6e authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov Committed by Michael Niedermayer

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: 's avatarClaudio Freire <klaussfreire@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a57ee6cc
...@@ -787,6 +787,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, ...@@ -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 { ...@@ -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;
/** /**
......
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