diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-06-26 21:16:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 14:24:30 +0200 |
| commit | 02dbed6e71e77f98c5831378f188fc268fc94fc2 (patch) | |
| tree | 5c9e71c2108b25cde45b05c031272c9c2072ac47 | |
| parent | a57ee6cca10d7329a2ce425db1b0a2f49e0971af (diff) | |
| download | ffmpeg-02dbed6e71e77f98c5831378f188fc268fc94fc2.tar.gz | |
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>
| -rw-r--r-- | libavcodec/aacpsy.c | 1 | ||||
| -rw-r--r-- | 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; /** |