summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-10-01 21:37:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-01 21:37:11 +0000
commitd0b9efe7d8300e48f7a99c1dd746d60060206b3c (patch)
treeff063a11d672bb71bbced27740eeac82216ed054 /media/libstagefright/codecs/aacdec/SoftAAC2.cpp
parent3af67d03bbc30c368821caf8b74ae7fb91ee7db7 (diff)
parent2965f4eb7dceaf1173f0e2d93c11c28293aeead7 (diff)
downloadframeworks_av-d0b9efe7d8300e48f7a99c1dd746d60060206b3c.zip
frameworks_av-d0b9efe7d8300e48f7a99c1dd746d60060206b3c.tar.gz
frameworks_av-d0b9efe7d8300e48f7a99c1dd746d60060206b3c.tar.bz2
Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.cpp')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index e701e9e..1b6eac4 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -368,6 +368,10 @@ OMX_ERRORTYPE SoftAAC2::internalSetParameter(
aacPresParams->nEncodedTargetLevel);
updateDrcWrapper = true;
}
+ if (aacPresParams->nPCMLimiterEnable >= 0) {
+ aacDecoder_SetParam(mAACDecoder, AAC_PCM_LIMITER_ENABLE,
+ (aacPresParams->nPCMLimiterEnable != 0));
+ }
if (updateDrcWrapper) {
mDrcWrap.update();
}