diff options
| author | Chong Zhang <chz@google.com> | 2014-10-10 22:19:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-10 22:19:44 +0000 |
| commit | aec1dbfd10150da3f28b64471b4dc249a58a104e (patch) | |
| tree | e35462b5917558f258b6b45b2e0ab4a0989d9a68 /media/libstagefright | |
| parent | f5ada6edcc83bb1b313abcd4c4fbdc4f7724f04d (diff) | |
| parent | 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b (diff) | |
| download | frameworks_av-aec1dbfd10150da3f28b64471b4dc249a58a104e.zip frameworks_av-aec1dbfd10150da3f28b64471b4dc249a58a104e.tar.gz frameworks_av-aec1dbfd10150da3f28b64471b4dc249a58a104e.tar.bz2 | |
Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index b693625..a6c9dcc 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3458,6 +3458,27 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> ¬ify) { break; } + case OMX_AUDIO_CodingG711: + { + OMX_AUDIO_PARAM_PCMMODETYPE params; + InitOMXParams(¶ms); + params.nPortIndex = portIndex; + + CHECK_EQ((status_t)OK, mOMX->getParameter( + mNode, + (OMX_INDEXTYPE)OMX_IndexParamAudioPcm, + ¶ms, + sizeof(params))); + + // mime type: + // MEDIA_MIMETYPE_AUDIO_G711_ALAW or + // MEDIA_MIMETYPE_AUDIO_G711_MLAW + notify->setString("mime", audioDef->cMIMEType); + notify->setInt32("channel-count", params.nChannels); + notify->setInt32("sample-rate", params.nSamplingRate); + break; + } + default: ALOGE("UNKNOWN AUDIO CODING: %d\n", audioDef->eEncoding); TRESPASS(); |