1 files changed, 49 insertions, 15 deletions

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 0598254..949c12f 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -37,6 +37,7 @@
 #include "../../libstagefright/include/NuCachedSource2.h"
 #include "../../libstagefright/include/WVMExtractor.h"
 #include "../../libstagefright/include/HTTPBase.h"
+#include "mediaplayerservice/AVNuExtensions.h"
 
 namespace android {
 
@@ -60,6 +61,7 @@ NuPlayer::GenericSource::GenericSource(
       mAudioIsVorbis(false),
       mIsWidevine(false),
       mIsSecure(false),
+      mUseSetBuffers(false),
       mIsStreaming(false),
       mUIDValid(uidValid),
       mUID(uid),
@@ -126,6 +128,7 @@ status_t NuPlayer::GenericSource::setDataSource(
 
 status_t NuPlayer::GenericSource::setDataSource(const sp<DataSource>& source) {
     resetDataSource();
+    Mutex::Autolock _l(mSourceLock);
     mDataSource = source;
     return OK;
 }
@@ -138,14 +141,14 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
     sp<MediaExtractor> extractor;
     String8 mimeType;
     float confidence;
-    sp<AMessage> dummy;
+    sp<AMessage> meta;
     bool isWidevineStreaming = false;
 
     CHECK(mDataSource != NULL);
 
     if (mIsWidevine) {
         isWidevineStreaming = SniffWVM(
-                mDataSource, &mimeType, &confidence, &dummy);
+                mDataSource, &mimeType, &confidence, &meta);
         if (!isWidevineStreaming ||
                 strcasecmp(
                     mimeType.string(), MEDIA_MIMETYPE_CONTAINER_WVM)) {
@@ -153,7 +156,12 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
             return UNKNOWN_ERROR;
         }
     } else if (mIsStreaming) {
-        if (!mDataSource->sniff(&mimeType, &confidence, &dummy)) {
+        sp<DataSource> dataSource;
+        {
+            Mutex::Autolock _l(mSourceLock);
+            dataSource = mDataSource;
+        }
+        if (!dataSource->sniff(&mimeType, &confidence, &meta)) {
             return UNKNOWN_ERROR;
         }
         isWidevineStreaming = !strcasecmp(
@@ -171,8 +179,14 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
         }
         extractor = mWVMExtractor;
     } else {
+#ifndef TARGET_8974
+        int32_t flags = AVNuUtils::get()->getFlags();
+#else
+        int32_t flags = 0;
+#endif
         extractor = MediaExtractor::Create(mDataSource,
-                mimeType.isEmpty() ? NULL : mimeType.string());
+                mimeType.isEmpty() ? NULL : mimeType.string(),
+                mIsStreaming ? 0 : flags, &meta);
     }
 
     if (extractor == NULL) {
@@ -202,6 +216,13 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
         }
     }
 
+#ifndef TARGET_8974
+    if (AVNuUtils::get()->canUseSetBuffers(mFileMeta)) {
+        mUseSetBuffers = true;
+        ALOGI("setBuffers mode enabled");
+    }
+#endif
+
     int32_t totalBitrate = 0;
 
     size_t numtracks = extractor->countTracks();
@@ -324,7 +345,7 @@ int64_t NuPlayer::GenericSource::getLastReadPosition() {
 
 status_t NuPlayer::GenericSource::setBuffers(
         bool audio, Vector<MediaBuffer *> &buffers) {
-    if (mIsWidevine && !audio && mVideoTrack.mSource != NULL) {
+    if (mIsSecure && !audio && mVideoTrack.mSource != NULL) {
         return mVideoTrack.mSource->setBuffers(buffers);
     }
     return INVALID_OPERATION;
@@ -346,7 +367,7 @@ void NuPlayer::GenericSource::prepareAsync() {
     if (mLooper == NULL) {
         mLooper = new ALooper;
         mLooper->setName("generic");
-        mLooper->start();
+        mLooper->start(false, false, PRIORITY_AUDIO);
 
         mLooper->registerHandler(this);
     }
@@ -378,13 +399,20 @@ void NuPlayer::GenericSource::onPrepareAsync() {
                 }
             }
 
-            mDataSource = DataSource::CreateFromURI(
+            sp<DataSource> dataSource;
+            dataSource = DataSource::CreateFromURI(
                    mHTTPService, uri, &mUriHeaders, &contentType,
-                   static_cast<HTTPBase *>(mHttpSource.get()));
+                   static_cast<HTTPBase *>(mHttpSource.get()),
+                   true /*use extended cache*/);
+            Mutex::Autolock _l(mSourceLock);
+            mDataSource = dataSource;
         } else {
             mIsWidevine = false;
 
-            mDataSource = new FileSource(mFd, mOffset, mLength);
+            sp<DataSource> dataSource;
+            dataSource = new FileSource(mFd, mOffset, mLength);
+            Mutex::Autolock _l(mSourceLock);
+            mDataSource = dataSource;
             mFd = -1;
         }
 
@@ -433,7 +461,8 @@ void NuPlayer::GenericSource::onPrepareAsync() {
             | FLAG_CAN_PAUSE
             | FLAG_CAN_SEEK_BACKWARD
             | FLAG_CAN_SEEK_FORWARD
-            | FLAG_CAN_SEEK);
+            | FLAG_CAN_SEEK
+            | (mUseSetBuffers ? FLAG_USE_SET_BUFFERS : 0));
 
     if (mIsSecure) {
         // secure decoders must be instantiated before starting widevine source
@@ -1030,7 +1059,8 @@ status_t NuPlayer::GenericSource::dequeueAccessUnit(
 
     // start pulling in more buffers if we only have one (or no) buffer left
     // so that decoder has less chance of being starved
-    if (track->mPackets->getAvailableBufferCount(&finalResult) < 2) {
+    if ((track->mPackets->getAvailableBufferCount(&finalResult) < 2)
+        && !mUseSetBuffers) {
         postReadBuffer(audio? MEDIA_TRACK_TYPE_AUDIO : MEDIA_TRACK_TYPE_VIDEO);
     }
 
@@ -1374,7 +1404,7 @@ sp<ABuffer> NuPlayer::GenericSource::mediaBufferToABuffer(
     }
 
     sp<ABuffer> ab;
-    if (mIsSecure && !audio) {
+    if ((mIsSecure || mUseSetBuffers) && !audio) {
         // data is already provided in the buffer
         ab = new ABuffer(NULL, mb->range_length());
         mb->add_ref();
@@ -1489,7 +1519,9 @@ void NuPlayer::GenericSource::readBuffer(
             break;
         case MEDIA_TRACK_TYPE_AUDIO:
             track = &mAudioTrack;
-            if (mIsWidevine) {
+            if (mHttpSource != NULL && getTrackCount() == 1) {
+                maxBuffers = 16;
+            } else if (mIsWidevine || (mHttpSource != NULL)) {
                 maxBuffers = 8;
             } else {
                 maxBuffers = 64;
@@ -1520,9 +1552,10 @@ void NuPlayer::GenericSource::readBuffer(
     if (seekTimeUs >= 0) {
         options.setSeekTo(seekTimeUs, MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC);
         seeking = true;
+        track->mPackets->clear();
     }
 
-    if (mIsWidevine) {
+    if (mIsWidevine || mUseSetBuffers) {
         options.setNonBlocking();
     }
 
@@ -1544,7 +1577,8 @@ void NuPlayer::GenericSource::readBuffer(
             queueDiscontinuityIfNeeded(seeking, formatChange, trackType, track);
 
             sp<ABuffer> buffer = mediaBufferToABuffer(
-                    mbuf, trackType, seekTimeUs, actualTimeUs);
+                    mbuf, trackType, seekTimeUs,
+                    numBuffers == 0 ? actualTimeUs : NULL);
             track->mPackets->queueAccessUnit(buffer);
             formatChange = false;
             seeking = false;