diff options
| author | Chong Zhang <chz@google.com> | 2014-10-02 12:39:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:39:22 +0000 |
| commit | bc6b959b0ff5f4fc83a049cba989edc0a06ae043 (patch) | |
| tree | 4243ea0be7e11c566449b5f3883aceb9d5545d0f /include | |
| parent | b76c2702fcae662b7ac0523d4735ef90c0f6dbba (diff) | |
| parent | 52cb10c4d794e5041e04f20d716aac82c325b06b (diff) | |
| download | frameworks_av-bc6b959b0ff5f4fc83a049cba989edc0a06ae043.zip frameworks_av-bc6b959b0ff5f4fc83a049cba989edc0a06ae043.tar.gz frameworks_av-bc6b959b0ff5f4fc83a049cba989edc0a06ae043.tar.bz2 | |
am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
* commit '52cb10c4d794e5041e04f20d716aac82c325b06b':
add AAC audio decoder params for PCM limiter enable
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index da4c20c..df0dc58 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -267,7 +267,8 @@ private: bool encoder, int32_t numChannels, int32_t sampleRate, int32_t bitRate, int32_t aacProfile, bool isADTS, int32_t sbrMode, - int32_t maxOutputChannelCount, const drcParams_t& drc); + int32_t maxOutputChannelCount, const drcParams_t& drc, + int32_t pcmLimiterEnable); status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate); |