From fae09bea7dbe8afbd44828f0c772737c8eb3b8bc Mon Sep 17 00:00:00 2001
From: Sharad Sangle <assangle@codeaurora.org>
Date: Wed, 15 Jul 2015 15:22:12 +0530
Subject: audio: add support for AMRWB+

add support for AMRWB+ audio decoding

Conflicts:
	media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

Change-Id: I6eedebe93c482150234b4ca1d0472b189c450dc6
---
 media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 3646828..aa77071 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -34,6 +34,7 @@
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MediaErrors.h>
 
+#include <stagefright/AVExtensions.h>
 #include <gui/Surface.h>
 
 #include "avc_utils.h"
@@ -251,8 +252,10 @@ void NuPlayer::Decoder::onConfigure(const sp<AMessage> &format) {
     mComponentName.append(" decoder");
     ALOGV("[%s] onConfigure (surface=%p)", mComponentName.c_str(), mSurface.get());
 
-    mCodec = MediaCodec::CreateByType(
-            mCodecLooper, mime.c_str(), false /* encoder */, NULL /* err */, mPid);
+    mCodec = AVUtils::get()->createCustomComponentByName(mCodecLooper, mime.c_str(), false /* encoder */);
+    if (mCodec == NULL) {
+        mCodec = MediaCodec::CreateByType(mCodecLooper, mime.c_str(), false /* encoder */);
+    }
     int32_t secure = 0;
     if (format->findInt32("secure", &secure) && secure != 0) {
         if (mCodec != NULL) {
-- 
cgit v1.1