diff options
| author | Chong Zhang <chz@google.com> | 2014-10-01 22:38:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 22:38:34 +0000 |
| commit | 17bef6401492d996232b5bc0859529a79834e810 (patch) | |
| tree | cb2929418f8b6b6fd3b66eda69e1b6d67e939473 /media/libstagefright/codecs | |
| parent | b7492f5616e7f71dfd1297bdd99c68079ddc6825 (diff) | |
| parent | d0b9efe7d8300e48f7a99c1dd746d60060206b3c (diff) | |
| download | frameworks_av-17bef6401492d996232b5bc0859529a79834e810.zip frameworks_av-17bef6401492d996232b5bc0859529a79834e810.tar.gz frameworks_av-17bef6401492d996232b5bc0859529a79834e810.tar.bz2 | |
am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
* commit 'd0b9efe7d8300e48f7a99c1dd746d60060206b3c':
add AAC audio decoder params for PCM limiter enable
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 4 |
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(); } |