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

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

am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase... 

am dfd03fe9: 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 'dfd03fe9'

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

media/libstagefright/AwesomePlayer.cpp

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


        if (eos) {

            notifyListener_l(MEDIA_BUFFERING_UPDATE, 100);

            if (mFlags & PREPARING) {

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

                finishAsyncPrepare_l();

            }

        } else {

            off_t size;

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