diff options
| author | Rachad <rachad@google.com> | 2015-01-10 02:06:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 02:06:41 +0000 |
| commit | b60bf91d2b1b2e45166cbb1eff9499de8b1c1105 (patch) | |
| tree | 8cfcdb2445524a2f523009a891b39ea37828a3ad /include | |
| parent | 8b5fa52002319b7c808cac468292af8527e2b858 (diff) | |
| parent | 7e85361e364bf8f80ab43dd5feb0f584e481019e (diff) | |
| download | frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.zip frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.tar.gz frameworks_av-b60bf91d2b1b2e45166cbb1eff9499de8b1c1105.tar.bz2 | |
am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev
* commit '7e85361e364bf8f80ab43dd5feb0f584e481019e':
ACodec: Added support for E-AC3 decoders
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 faa2caf..371e2c8 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -283,6 +283,8 @@ private: status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate); + status_t setupEAC3Codec(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 1f9ff45..a0036e0 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -48,6 +48,7 @@ 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_AUDIO_EAC3; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4; extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; |