summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-10-19 17:29:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-19 17:29:22 -0700
commit7b5242735928e59b084405b8361fe86ee490e20d (patch)
tree30eefe4fe60a2ac106c0175cfdd4fee3533decea
parentb411ab3d7dbd6da7ec153fc7ed6bfe90bc21523b (diff)
parentd483b1c83b7630eb28299c37e92aeade104f6bd8 (diff)
downloadframeworks_av-7b5242735928e59b084405b8361fe86ee490e20d.zip
frameworks_av-7b5242735928e59b084405b8361fe86ee490e20d.tar.gz
frameworks_av-7b5242735928e59b084405b8361fe86ee490e20d.tar.bz2
am ad99e748: am c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
* commit 'ad99e748ae97be7b0f769e1895ca7f69da6c9df8': AAC DRC reference level for mobile is -16dB
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index ff8cc3e..d88813e 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -27,7 +27,7 @@
#define FILEREAD_MAX_LAYERS 2
-#define DRC_DEFAULT_MOBILE_REF_LEVEL 48 /* 48*-0.25dB = -12 dB below full scale for mobile conf */
+#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 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