commit 380757ba5c927015d403e3b97cc418413330453e
author Guang Zhu <guangzhu@google.com> Mon Oct 13 00:02:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 13 00:02:37 2014 +0000
tree 7c96b4c90e05dedccb318ca43fd4c3bf82e7204b
parent 9286354c0a864ce2348cc7dfc6ca81e84a15f8e2
parent 667623ac75700fc1bb4829b8275c4fc29c631fe9

Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

media/libstagefright/ACodec.cpp

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 @@
                     break;
                 }
 
-                case OMX_AUDIO_CodingG711:
-                {
-                    OMX_AUDIO_PARAM_PCMMODETYPE params;
-                    InitOMXParams(&params);
-                    params.nPortIndex = portIndex;
-
-                    CHECK_EQ((status_t)OK, mOMX->getParameter(
-                            mNode,
-                            (OMX_INDEXTYPE)OMX_IndexParamAudioPcm,
-                            &params,
-                            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();