Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e3edc2d authored by Andreas Huber's avatar Andreas Huber
Browse files

DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor. 

The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172
related-to-bug: 3362836
parent f4c056ae

media/libstagefright/AwesomePlayer.cpp

+30 −3
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ namespace android { 


static int64_t kLowWaterMarkUs = 2000000ll;  // 2secs

static int64_t kHighWaterMarkUs = 10000000ll;  // 10secs

static const size_t kLowWaterMarkBytes = 40000;

static const size_t kHighWaterMarkBytes = 200000;



struct AwesomeEvent : public TimedEventQueue::Event {

    AwesomeEvent(
@@ -589,9 +591,6 @@ void AwesomePlayer::onBufferingUpdate() { 
                // We don't know the bitrate of the stream, use absolute size

                // limits to maintain the cache.



                const size_t kLowWaterMarkBytes = 40000;

                const size_t kHighWaterMarkBytes = 200000;



                if ((mFlags & PLAYING) && !eos

                        && (cachedDataRemaining < kLowWaterMarkBytes)) {

                    LOGI("cache is running low (< %d) , pausing.",
@@ -1478,6 +1477,34 @@ status_t AwesomePlayer::finishSetDataSource_l() { 
        mConnectingDataSource.clear();



        dataSource = mCachedSource;



        // We're going to prefill the cache before trying to instantiate

        // the extractor below, as the latter is an operation that otherwise

        // could block on the datasource for a significant amount of time.

        // During that time we'd be unable to abort the preparation phase

        // without this prefill.



        mLock.unlock();



        for (;;) {

            bool eos;

            size_t cachedDataRemaining =

                mCachedSource->approxDataRemaining(&eos);



            if (eos || cachedDataRemaining >= kHighWaterMarkBytes

                    || (mFlags & PREPARE_CANCELLED)) {

                break;

            }



            usleep(200000);

        }



        mLock.lock();



        if (mFlags & PREPARE_CANCELLED) {

            LOGI("Prepare cancelled while waiting for initial cache fill.");

            return UNKNOWN_ERROR;

        }

    } else if (!strncasecmp(mUri.string(), "httplive://", 11)) {

        String8 uri("http://");

        uri.append(mUri.string() + 11);

media/libstagefright/NuCachedSource2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



//#define LOG_NDEBUG 0

#define LOG_TAG "NuCachedSource2"

#include <utils/Log.h>