diff options
| author | Guang Zhu <guangzhu@google.com> | 2014-10-13 00:18:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 00:18:46 +0000 |
| commit | 0ed9ef31c302ebe081589f8e8603832f79c664a8 (patch) | |
| tree | 65ed0b25fe41450ed798f8a6f75e8f67d3b39aa3 /media/libstagefright/ACodec.cpp | |
| parent | c979288717f707521926b267ceb37f1c07bd4a4b (diff) | |
| parent | 0f69763d41c101a2afcac7f10be86b41974f1279 (diff) | |
| download | frameworks_av-0ed9ef31c302ebe081589f8e8603832f79c664a8.zip frameworks_av-0ed9ef31c302ebe081589f8e8603832f79c664a8.tar.gz frameworks_av-0ed9ef31c302ebe081589f8e8603832f79c664a8.tar.bz2 | |
am 0f69763d: am ee3f39f6: am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev
* commit '0f69763d41c101a2afcac7f10be86b41974f1279':
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 51dcebf..e5c16ea 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3458,27 +3458,6 @@ 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(); |