summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-08-08 21:05:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-08 16:09:03 +0000
commitddabe554e95940891c5df9a7f092798351b5f75e (patch)
tree5e58b35801c040a48b95c071a454a1b8bb35d7ee /include
parent15ff76c99482eab01934cf0f55c815a85cf06f35 (diff)
parent8045853d03649f43ea2f7107e7d2dbb9b2d20855 (diff)
downloadframeworks_av-ddabe554e95940891c5df9a7f092798351b5f75e.zip
frameworks_av-ddabe554e95940891c5df9a7f092798351b5f75e.tar.gz
frameworks_av-ddabe554e95940891c5df9a7f092798351b5f75e.tar.bz2
Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 3dd34ce..3a6bb9e 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -252,10 +252,19 @@ private:
int32_t width, int32_t height,
OMX_VIDEO_CODINGTYPE compressionFormat);
+ typedef struct drcParams {
+ int32_t drcCut;
+ int32_t drcBoost;
+ int32_t heavyCompression;
+ int32_t targetRefLevel;
+ int32_t encodedTargetLevel;
+ } drcParams_t;
+
status_t setupAACCodec(
bool encoder,
int32_t numChannels, int32_t sampleRate, int32_t bitRate,
- int32_t aacProfile, bool isADTS, int32_t sbrMode);
+ int32_t aacProfile, bool isADTS, int32_t sbrMode,
+ int32_t maxOutputChannelCount, const drcParams_t& drc);
status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate);