Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee3f39f6 authored by Guang Zhu's avatar Guang Zhu Committed by Android Git Automerger
Browse files

am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in... 

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

* commit '380757ba':
  Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
parents fa845267 380757ba

media/libstagefright/ACodec.cpp

+0 −21
Original line number Diff line number Diff line
@@ -3458,27 +3458,6 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                    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();