diff options
| author | Chong Zhang <chz@google.com> | 2014-10-01 21:41:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 21:41:30 +0000 |
| commit | 52cb10c4d794e5041e04f20d716aac82c325b06b (patch) | |
| tree | 8299a211f6e1c912507820a43f9034fa9ea8e597 /include | |
| parent | 8359c43a8261ee2cc1f8580f5722975d952421c9 (diff) | |
| parent | d0b9efe7d8300e48f7a99c1dd746d60060206b3c (diff) | |
| download | frameworks_av-52cb10c4d794e5041e04f20d716aac82c325b06b.zip frameworks_av-52cb10c4d794e5041e04f20d716aac82c325b06b.tar.gz frameworks_av-52cb10c4d794e5041e04f20d716aac82c325b06b.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 '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); |