diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-04-16 15:42:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 15:42:00 +0000 |
| commit | ff4b1e2b9a7109669ce794692553a2ce14981923 (patch) | |
| tree | fb97e69c59a6dcd55cf1d202ca6fa7c4900022aa /media/libstagefright/codecs/aacdec/SoftAAC2.cpp | |
| parent | 94b66227ff5a57dd810aafa7b3aa810b9a185b8d (diff) | |
| parent | 0e03e72e7bb2633f5a16c2fe7c164bc3ec8ca855 (diff) | |
| download | frameworks_av-ff4b1e2b9a7109669ce794692553a2ce14981923.zip frameworks_av-ff4b1e2b9a7109669ce794692553a2ce14981923.tar.gz frameworks_av-ff4b1e2b9a7109669ce794692553a2ce14981923.tar.bz2 | |
Merge "Better default AAC DRC setting" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 536cfde..cf81c16 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -29,6 +29,7 @@ #define DRC_DEFAULT_MOBILE_REF_LEVEL 64 /* 64*-0.25dB = -16 dB below full scale for mobile conf */ #define DRC_DEFAULT_MOBILE_DRC_CUT 127 /* maximum compression of dynamic range for mobile conf */ +#define DRC_DEFAULT_MOBILE_DRC_BOOST 127 /* maximum compression of dynamic range for mobile conf */ #define MAX_CHANNEL_COUNT 6 /* maximum number of audio channels that can be decoded */ // names of properties that can be used to override the default DRC settings #define PROP_DRC_OVERRIDE_REF_LEVEL "aac_drc_reference_level" @@ -146,6 +147,8 @@ status_t SoftAAC2::initDecoder() { unsigned boost = atoi(value); ALOGV("AAC decoder using AAC_DRC_BOOST_FACTOR of %d", boost); aacDecoder_SetParam(mAACDecoder, AAC_DRC_BOOST_FACTOR, boost); + } else { + aacDecoder_SetParam(mAACDecoder, AAC_DRC_BOOST_FACTOR, DRC_DEFAULT_MOBILE_DRC_BOOST); } return status; |