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

Commit dfd03fe9 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs... 

am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'aa1a694d' into gingerbread-plus-aosp

* commit 'aa1a694d':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
parents bb506dab aa1a694d

media/libstagefright/AwesomePlayer.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -484,6 +484,10 @@ void AwesomePlayer::onBufferingUpdate() { 




        if (eos) {

        if (eos) {

            notifyListener_l(MEDIA_BUFFERING_UPDATE, 100);

            notifyListener_l(MEDIA_BUFFERING_UPDATE, 100);

            if (mFlags & PREPARING) {

                LOGV("cache has reached EOS, prepare is done.");

                finishAsyncPrepare_l();

            }

        } else {

        } else {

            off_t size;

            off_t size;

            if (mDurationUs >= 0 && mCachedSource->getSize(&size) == OK) {

            if (mDurationUs >= 0 && mCachedSource->getSize(&size) == OK) {