From f9756b6900daa0f98bbcbb7d26f6184cda2a8eef Mon Sep 17 00:00:00 2001
From: Weiyin Jiang <wjiang@codeaurora.org>
Date: Tue, 4 Aug 2015 16:24:47 +0800
Subject: audio: add support for vorbis offloading

add support for vorbis offload playback

Change-Id: Ic51a9d3e0fad1114908f59bfbc6ce62c6fd9fdea
---
 media/libavextensions/mediaplayerservice/AVNuExtensions.h |  1 +
 media/libavextensions/mediaplayerservice/AVNuUtils.cpp    |  3 +++
 media/libavextensions/stagefright/AVExtensions.h          | 11 +++++++----
 media/libavextensions/stagefright/AVUtils.cpp             |  4 ++++
 4 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'media/libavextensions')

diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
index ccf3615..6ab790f 100644
--- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h
+++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
@@ -69,6 +69,7 @@ struct AVNuUtils {
     virtual bool pcmOffloadException(const sp<MetaData> &);
     virtual bool isRAWFormat(const sp<MetaData> &);
     virtual bool isRAWFormat(const sp<AMessage> &);
+    virtual bool isVorbisFormat(const sp<MetaData> &);
     virtual int updateAudioBitWidth(audio_format_t audioFormat,
             const sp<AMessage> &);
     virtual audio_format_t getKeyPCMFormat(const sp<MetaData> &);
diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
index e890a61..2e2e511 100644
--- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
+++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
@@ -61,6 +61,9 @@ bool AVNuUtils::isRAWFormat(const sp<AMessage> &) {
     return false;
 }
 
+bool AVNuUtils::isVorbisFormat(const sp<MetaData> &) {
+    return false;
+}
 
 int AVNuUtils::updateAudioBitWidth(audio_format_t /*audioFormat*/,
         const sp<AMessage> &){
diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
index 06257be..8ac21a1 100644
--- a/media/libavextensions/stagefright/AVExtensions.h
+++ b/media/libavextensions/stagefright/AVExtensions.h
@@ -35,13 +35,15 @@
 
 namespace android {
 
-struct ACodec;
+class AudioParameter;
+class MetaData;
 class MediaExtractor;
+struct ACodec;
+struct ALooper;
+struct IMediaHTTPConnection;
 struct MediaCodec;
-class AudioParameter;
-struct NuCachedSource2;
 struct MediaHTTP;
-struct IMediaHTTPConnection;
+struct NuCachedSource2;
 
 /*
  * Factory to create objects of base-classes in libstagefright
@@ -74,6 +76,7 @@ struct AVUtils {
 
     virtual sp<MediaCodec> createCustomComponentByName(const sp<ALooper> &looper,
                 const char* mime, bool encoder);
+    virtual bool isEnhancedExtension(const char *extension);
 
     virtual bool is24bitPCMOffloadEnabled();
     virtual bool is16bitPCMOffloadEnabled();
diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp
index ee0602b..64bbc03 100644
--- a/media/libavextensions/stagefright/AVUtils.cpp
+++ b/media/libavextensions/stagefright/AVUtils.cpp
@@ -105,6 +105,10 @@ bool AVUtils::canOffloadAPE(const sp<MetaData> &meta) {
    return true;
 }
 
+bool AVUtils::isEnhancedExtension(const char *) {
+    return false;
+}
+
 // ----- NO TRESSPASSING BEYOND THIS LINE ------
 AVUtils::AVUtils() {
 }
-- 
cgit v1.1