diff options
author | Guang Zhu <guangzhu@google.com> | 2014-10-13 00:02:20 +0000 |
---|---|---|
committer | Guang Zhu <guangzhu@google.com> | 2014-10-13 00:02:20 +0000 |
commit | 667623ac75700fc1bb4829b8275c4fc29c631fe9 (patch) | |
tree | 62c42c9bc76c24ef54ead03c42501b63e706f481 | |
parent | 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b (diff) | |
download | frameworks_av-667623ac75700fc1bb4829b8275c4fc29c631fe9.zip frameworks_av-667623ac75700fc1bb4829b8275c4fc29c631fe9.tar.gz frameworks_av-667623ac75700fc1bb4829b8275c4fc29c631fe9.tar.bz2 |
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
Bug: 17935293
fix 64-bit builds
This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b.
Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
-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 a6c9dcc..b693625 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(); |