commit a26e58ef564b26c9eef610c8bd747836a5ad4c47
author Lajos Molnar <lajos@google.com> Thu May 29 02:07:16 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 29 02:07:16 2014 +0000
tree 7d6e5605e35c96f127c71b3466130275bab18908
parent 6e2af42884a470d2160c84441fc92984f3919a1d
parent 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55

Merge "libstagefright: Add Opus support to ACodec::getPortFormat"

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 8f154be..d3c508d 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2872,6 +2872,24 @@
                     break;
                 }
 
+                case OMX_AUDIO_CodingAndroidOPUS:
+                {
+                    OMX_AUDIO_PARAM_ANDROID_OPUSTYPE params;
+                    InitOMXParams(&params);
+                    params.nPortIndex = portIndex;
+
+                    CHECK_EQ((status_t)OK, mOMX->getParameter(
+                            mNode,
+                            (OMX_INDEXTYPE)OMX_IndexParamAudioAndroidOpus,
+                            &params,
+                            sizeof(params)));
+
+                    notify->setString("mime", MEDIA_MIMETYPE_AUDIO_OPUS);
+                    notify->setInt32("channel-count", params.nChannels);
+                    notify->setInt32("sample-rate", params.nSampleRate);
+                    break;
+                }
+
                 default:
                     ALOGE("UNKNOWN AUDIO CODING: %d\n", audioDef->eEncoding);
                     TRESPASS();