summaryrefslogtreecommitdiffstats
path: root/media
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
commitcbe8d1085b895d83c89ef104941a2426227de9ff (patch)
tree079f0319e8af88c0e7cb08b76c28d6537e6342a8 /media
parentcffeb15b9bf85657a2b03398cac3e3085cfdbdb2 (diff)
parentad99e748ae97be7b0f769e1895ca7f69da6c9df8 (diff)
downloadframeworks_av-cbe8d1085b895d83c89ef104941a2426227de9ff.zip
frameworks_av-cbe8d1085b895d83c89ef104941a2426227de9ff.tar.gz
frameworks_av-cbe8d1085b895d83c89ef104941a2426227de9ff.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
Diffstat (limited to 'media')
-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