summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChangwan Ryu <changwan@google.com>2013-10-28 10:53:48 +0900
committerDongwon Kang <dwkang@google.com>2014-02-03 14:11:45 +0900
commit9090338367bd9f3fc5678032332a44d457a4a2fe (patch)
treebc95b12fc9e71cd8705e6e4ffe27c7017551d806 /include
parentadf3f9b98b482180fc1d0835c1b6212b1659e249 (diff)
downloadframeworks_av-9090338367bd9f3fc5678032332a44d457a4a2fe.zip
frameworks_av-9090338367bd9f3fc5678032332a44d457a4a2fe.tar.gz
frameworks_av-9090338367bd9f3fc5678032332a44d457a4a2fe.tar.bz2
[DO NOT MERGE] Support AC3 in stagefright
Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h2
-rw-r--r--include/media/stagefright/MediaDefs.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 7395055..f1636e6 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -249,6 +249,8 @@ private:
int32_t numChannels, int32_t sampleRate, int32_t bitRate,
int32_t aacProfile, bool isADTS);
+ status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate);
+
status_t selectAudioPortFormat(
OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE desiredFormat);
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index 85693d4..cf5beda 100644
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -44,6 +44,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_RAW;
extern const char *MEDIA_MIMETYPE_AUDIO_FLAC;
extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS;
extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;
+extern const char *MEDIA_MIMETYPE_AUDIO_AC3;
extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;
extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;