From 95922a29f586d7dbe0356313ccc66e1bc71bd72a Mon Sep 17 00:00:00 2001
From: Praveen Chavan <pchavan@codeaurora.org>
Date: Fri, 23 Oct 2015 15:31:52 -0700
Subject: AudioTrack: Fix the signature of AudioTrackGetTimestamp

to invoke the customized method correctly.

CRs-Fixed: 923592
Change-Id: I8a7da0a679bebaa70076920936081be4470da6d1
---
 media/libavextensions/media/AVMediaExtensions.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'media/libavextensions')

diff --git a/media/libavextensions/media/AVMediaExtensions.h b/media/libavextensions/media/AVMediaExtensions.h
index 6cf39f2..ae26143 100644
--- a/media/libavextensions/media/AVMediaExtensions.h
+++ b/media/libavextensions/media/AVMediaExtensions.h
@@ -47,12 +47,12 @@ struct AVMediaUtils {
         return false;
     }
     virtual status_t AudioTrackGetPosition(AudioTrack* /*track*/,
-                                             uint32_t* /*position*/) {
+            uint32_t* /*position*/) {
         return NO_INIT;
     }
 
     virtual status_t AudioTrackGetTimestamp(AudioTrack* /*track*/,
-                                             AudioTimestamp /*timestamp*/) {
+            AudioTimestamp* /*timestamp*/) {
         return NO_INIT;
     }
 
-- 
cgit v1.1


From dcd760385776f0e4176cf763c8042d56af7e4503 Mon Sep 17 00:00:00 2001
From: Shivaprasad Hongal <shongal@codeaurora.org>
Date: Mon, 26 Oct 2015 19:05:35 -0700
Subject: Stagefright: use set buffers mode.

Use set buffers mode if parser supports it.

Change-Id: Ia3d12f15fa28f25e1ccb724158cc91ce26fc81ed
---
 media/libavextensions/mediaplayerservice/AVNuExtensions.h | 2 ++
 media/libavextensions/mediaplayerservice/AVNuUtils.cpp    | 8 ++++++++
 media/libavextensions/stagefright/AVExtensions.h          | 4 ++--
 media/libavextensions/stagefright/AVFactory.cpp           | 5 +++--
 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 a10937d..c6aba71 100644
--- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h
+++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
@@ -80,6 +80,8 @@ struct AVNuUtils {
     virtual void setDecodedPCMFormat(const sp<AMessage> &);
     virtual status_t convertToSinkFormatIfNeeded(const sp<ABuffer> &, sp<ABuffer> &,
             audio_format_t sinkFormat, bool isOffload);
+    virtual uint32_t getUseSetBuffersFlag();
+    virtual bool canUseSetBuffers(const sp<MetaData> &Meta);
 
     virtual void printFileName(int fd);
     virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit);
diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
index aacf76a..c254a70 100644
--- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
+++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
@@ -104,6 +104,14 @@ void AVNuUtils::checkFormatChange(bool * /*formatChange*/,
         const sp<ABuffer> & /*accessUnit*/) {
 }
 
+uint32_t AVNuUtils::getUseSetBuffersFlag() {
+    return 0;
+}
+
+bool AVNuUtils::canUseSetBuffers(const sp<MetaData> &/*Meta*/) {
+    return false;
+}
+
 // ----- NO TRESSPASSING BEYOND THIS LINE ------
 AVNuUtils::AVNuUtils() {}
 
diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
index 9c712e4..b45c051 100644
--- a/media/libavextensions/stagefright/AVExtensions.h
+++ b/media/libavextensions/stagefright/AVExtensions.h
@@ -68,10 +68,10 @@ struct AVFactory {
     virtual sp<ACodec> createACodec();
     virtual MediaExtractor* createExtendedExtractor(
             const sp<DataSource> &source, const char *mime,
-            const sp<AMessage> &meta);
+            const sp<AMessage> &meta, const uint32_t flags);
     virtual sp<MediaExtractor> updateExtractor(
             sp<MediaExtractor> ext, const sp<DataSource> &source,
-            const char *mime, const sp<AMessage> &meta);
+            const char *mime, const sp<AMessage> &meta, const uint32_t flags);
     virtual sp<NuCachedSource2> createCachedSource(
             const sp<DataSource> &source,
             const char *cacheConfig = NULL,
diff --git a/media/libavextensions/stagefright/AVFactory.cpp b/media/libavextensions/stagefright/AVFactory.cpp
index 90ac7b2..2a3810d 100644
--- a/media/libavextensions/stagefright/AVFactory.cpp
+++ b/media/libavextensions/stagefright/AVFactory.cpp
@@ -57,13 +57,14 @@ sp<ACodec> AVFactory::createACodec() {
 }
 
 MediaExtractor* AVFactory::createExtendedExtractor(
-         const sp<DataSource> &, const char *, const sp<AMessage> &) {
+         const sp<DataSource> &, const char *, const sp<AMessage> &,
+         const uint32_t) {
     return NULL;
 }
 
 sp<MediaExtractor> AVFactory::updateExtractor(
             sp<MediaExtractor> ext, const sp<DataSource> &,
-            const char *, const sp<AMessage> &) {
+            const char *, const sp<AMessage> &, const uint32_t) {
     return ext;
 }
 
-- 
cgit v1.1