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

Commit 4c73d55c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5694913 from 5146b355 to qt-c2f2-release 

Change-Id: Iea1e8f2ee0845d148e51ae37b42bbe00ee057f59
parents b26e56f9 5146b355

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ void NuPlayer::GenericSource::onPollBuffering() { 
        }



        if (mPreparing) {

            notifyPreparedAndCleanup(finalStatus);

            notifyPreparedAndCleanup(finalStatus == ERROR_END_OF_STREAM ? OK : finalStatus);

            mPreparing = false;

        } else if (mSentPauseOnBuffering) {

            sendCacheStats();

media/libstagefright/codecs/m4v_h263/dec/src/packet_util.cpp

+5 −1
Original line number Diff line number Diff line
@@ -52,7 +52,11 @@ PV_STATUS PV_ReadVideoPacketHeader(VideoDecData *video, int *next_MB) 
        PV_BitstreamByteAlign(stream);

        BitstreamReadBits32(stream, resync_marker_length);



        *next_MB = (int) BitstreamReadBits16(stream, nbits);

        int mbnum = (int) BitstreamReadBits16(stream, nbits);

        if (mbnum < 0) {

            return PV_FAIL;

        }

        *next_MB = mbnum;

//      if (*next_MB <= video->mbnum)   /*  needs more investigation */

//          *next_MB = video->mbnum+1;