From 02dbed6e71e77f98c5831378f188fc268fc94fc2 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Fri, 26 Jun 2015 21:16:35 +0100 Subject: [PATCH] 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 Signed-off-by: Michael Niedermayer --- libavcodec/aacpsy.c | 1 + libavcodec/psymodel.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 3a66159476..78232d4518 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -787,6 +787,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, psy_band->threshold = band->thr; psy_band->energy = band->energy; + psy_band->spread = spread_en[w+g]; } } diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index 75261ba4be..2e3ab911e4 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -38,8 +38,7 @@ typedef struct FFPsyBand { int bits; float energy; float threshold; - float distortion; - float perceptual_weight; + float spread; /* Energy spread over the band */ } FFPsyBand; /**