summaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/media/stagefright/ACodec.h3
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);