From d4c3afbb613f7201ece31ad2230ec22289422680 Mon Sep 17 00:00:00 2001
From: Sidipotu Ashok <sashok@codeaurora.org>
Date: Fri, 16 Oct 2015 06:16:13 +0530
Subject: NuPlayer: use a generic funtion to get flags

Use a generic function to get flags while creating
extractor, so that there is no restriction to a
particular usecase.

CRs-Fixed: 911338
Change-Id: I8520d2ea9b25ab564b7eee6610744fcaa364fe87
---
 media/libavextensions/mediaplayerservice/AVNuExtensions.h | 2 +-
 media/libavextensions/mediaplayerservice/AVNuUtils.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'media/libavextensions/mediaplayerservice')

diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
index c6aba71..7aeb5c3 100644
--- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h
+++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
@@ -80,7 +80,7 @@ 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 uint32_t getFlags();
     virtual bool canUseSetBuffers(const sp<MetaData> &Meta);
 
     virtual void printFileName(int fd);
diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
index c254a70..51c4a37 100644
--- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
+++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
@@ -104,7 +104,7 @@ void AVNuUtils::checkFormatChange(bool * /*formatChange*/,
         const sp<ABuffer> & /*accessUnit*/) {
 }
 
-uint32_t AVNuUtils::getUseSetBuffersFlag() {
+uint32_t AVNuUtils::getFlags() {
     return 0;
 }
 
-- 
cgit v1.1


From a729f437f5f46efbd366721d7d4f398186ce77cd Mon Sep 17 00:00:00 2001
From: Shalaj Jain <shalajj@codeaurora.org>
Date: Tue, 13 Oct 2015 17:56:23 -0700
Subject: nuplayer: Drop frames with DATACORRUPT flag

Drop frames in NuplayerDecoder if the corresponding
OMX_BUFFERFLAG_DATACORRUPT is set from OMX.

Add a util function to easily switch off this feature.

Do not declare MediaSource explicitly.

Change-Id: I97bd238d52d660e1ab61eac222cdff28334cc5cc
---
 media/libavextensions/mediaplayerservice/AVNuExtensions.h | 1 +
 media/libavextensions/mediaplayerservice/AVNuUtils.cpp    | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'media/libavextensions/mediaplayerservice')

diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
index 7aeb5c3..1d45c00 100644
--- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h
+++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
@@ -85,6 +85,7 @@ struct AVNuUtils {
 
     virtual void printFileName(int fd);
     virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit);
+    virtual bool dropCorruptFrame();
 
     // ----- NO TRESSPASSING BEYOND THIS LINE ------
     DECLARE_LOADABLE_SINGLETON(AVNuUtils);
diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
index 51c4a37..95f6454 100644
--- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
+++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
@@ -112,6 +112,8 @@ bool AVNuUtils::canUseSetBuffers(const sp<MetaData> &/*Meta*/) {
     return false;
 }
 
+bool AVNuUtils::dropCorruptFrame() { return false; }
+
 // ----- NO TRESSPASSING BEYOND THIS LINE ------
 AVNuUtils::AVNuUtils() {}
 
-- 
cgit v1.1