diff options
author | Chong Zhang <chz@google.com> | 2014-10-10 22:22:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 22:22:42 +0000 |
commit | a0041d67a7d45e55ed88a7b0ff548708fa82872e (patch) | |
tree | e95ab5547336447195b9a441d9566276ca64e978 /media | |
parent | e20685f5322f4bb1194dab5db5e237d1e069c57b (diff) | |
parent | aec1dbfd10150da3f28b64471b4dc249a58a104e (diff) | |
download | frameworks_av-a0041d67a7d45e55ed88a7b0ff548708fa82872e.zip frameworks_av-a0041d67a7d45e55ed88a7b0ff548708fa82872e.tar.gz frameworks_av-a0041d67a7d45e55ed88a7b0ff548708fa82872e.tar.bz2 |
am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
* commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e':
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
Diffstat (limited to 'media')
-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 e5c16ea..51dcebf 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(); |