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/libavextensions/stagefright/AVExtensions.h | 3 +++
 media/libavextensions/stagefright/AVUtils.cpp    | 6 ++++++
 2 files changed, 9 insertions(+)

(limited to 'media/libavextensions')

diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
index 43d61be..08dbeeb 100644
--- a/media/libavextensions/stagefright/AVExtensions.h
+++ b/media/libavextensions/stagefright/AVExtensions.h
@@ -36,6 +36,7 @@ namespace android {
 
 struct ACodec;
 class MediaExtractor;
+struct MediaCodec;
 
 /*
  * Factory to create objects of base-classes in libstagefright
@@ -58,6 +59,8 @@ struct AVUtils {
             const sp<MetaData> &meta, sp<AMessage> *format);
     virtual DataSource::SnifferFunc getExtendedSniffer();
 
+    virtual sp<MediaCodec> createCustomComponentByName(const sp<ALooper> &looper,
+                const char* mime, bool encoder);
     // ----- NO TRESSPASSING BEYOND THIS LINE ------
     DECLARE_LOADABLE_SINGLETON(AVUtils);
 };
diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp
index 3c2ecd9..8fe0c53 100644
--- a/media/libavextensions/stagefright/AVUtils.cpp
+++ b/media/libavextensions/stagefright/AVUtils.cpp
@@ -37,6 +37,7 @@
 #include <media/stagefright/MediaCodecList.h>
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/ACodec.h>
+#include <media/stagefright/MediaCodec.h>
 
 #include "common/ExtensionsLoader.hpp"
 #include "stagefright/AVExtensions.h"
@@ -58,6 +59,11 @@ DataSource::SnifferFunc AVUtils::getExtendedSniffer() {
     return dumbSniffer;
 }
 
+sp<MediaCodec> AVUtils::createCustomComponentByName(
+        const sp<ALooper> &, const char* , bool ) {
+    return NULL;
+}
+
 // ----- NO TRESSPASSING BEYOND THIS LINE ------
 AVUtils::AVUtils() {
 }
-- 
cgit v1.1