diff options
| author | Changwan Ryu <changwan@google.com> | 2014-02-04 07:31:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-04 07:31:44 +0000 |
| commit | aae8d29f74d05460a57d0843f6bed95d36a2145b (patch) | |
| tree | f0130935cd162b14fb5553fd430158ef26a09673 /include | |
| parent | 324d9157a30f85fb12afa56b2230663ccdd61ced (diff) | |
| parent | 9090338367bd9f3fc5678032332a44d457a4a2fe (diff) | |
| download | frameworks_av-aae8d29f74d05460a57d0843f6bed95d36a2145b.zip frameworks_av-aae8d29f74d05460a57d0843f6bed95d36a2145b.tar.gz frameworks_av-aae8d29f74d05460a57d0843f6bed95d36a2145b.tar.bz2 | |
am 90903383: [DO NOT MERGE] Support AC3 in stagefright
* commit '9090338367bd9f3fc5678032332a44d457a4a2fe':
[DO NOT MERGE] Support AC3 in stagefright
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 |
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; |