From 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 9 Oct 2014 21:33:53 -0700
Subject: [PATCH] handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
---
 media/libstagefright/ACodec.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index b693625ab1..a6c9dccc75 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3458,6 +3458,27 @@ 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();
-- 
2.11.0