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

Commit 6efa6e62 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev 

am: 4ecb8af1

* commit '4ecb8af1':
  NuPlayer: remove the condition on sending BUFFERING_START event.

Change-Id: I992d6b70152dc6f7cc8cf6d7ecebcc0a59481cb3
parents c7fc3e21 4ecb8af1

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+1 −15
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ NuPlayer::NuPlayer(pid_t pid) 
      mSourceStarted(false),

      mPaused(false),

      mPausedByClient(true),

      mPendingBufferingFlag(PENDING_BUFFERING_FLAG_NONE),

      mPausedForBuffering(false) {

    clearFlushComplete();

}
@@ -723,10 +722,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                onStart();

            }

            mPausedByClient = false;

            if (mPendingBufferingFlag != PENDING_BUFFERING_FLAG_NONE) {

                notifyListener(MEDIA_INFO, mPendingBufferingFlag, 0);

                mPendingBufferingFlag = PENDING_BUFFERING_FLAG_NONE;

            }

            break;

        }
@@ -1218,8 +1213,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                break;

            }



            mPendingBufferingFlag = PENDING_BUFFERING_FLAG_NONE;



            mDeferredActions.push_back(

                    new FlushDecoderAction(FLUSH_CMD_FLUSH /* audio */,

                                           FLUSH_CMD_FLUSH /* video */));
@@ -1963,7 +1956,6 @@ void NuPlayer::performSeek(int64_t seekTimeUs) { 
    }

    mPreviousSeekTimeUs = seekTimeUs;

    mSource->seekTo(seekTimeUs);

    mPendingBufferingFlag = PENDING_BUFFERING_FLAG_NONE;

    ++mTimedTextGeneration;



    // everything's flushed, continue playback.
@@ -2209,12 +2201,7 @@ void NuPlayer::onSourceNotify(const sp<AMessage> &msg) { 


        case Source::kWhatBufferingStart:

        {

            if (mPausedByClient) {

                mPendingBufferingFlag = PENDING_BUFFERING_FLAG_START;

            } else {

            notifyListener(MEDIA_INFO, MEDIA_INFO_BUFFERING_START, 0);

                mPendingBufferingFlag = PENDING_BUFFERING_FLAG_NONE;

            }

            break;

        }
@@ -2237,7 +2224,6 @@ void NuPlayer::onSourceNotify(const sp<AMessage> &msg) { 
        case Source::kWhatBufferingEnd:

        {

            notifyListener(MEDIA_INFO, MEDIA_INFO_BUFFERING_END, 0);

            mPendingBufferingFlag = PENDING_BUFFERING_FLAG_NONE;

            break;

        }

media/libmediaplayerservice/nuplayer/NuPlayer.h

+0 −9
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ private: 
        FLUSH_CMD_SHUTDOWN,

    };



    enum PendingBufferingFlag {

        PENDING_BUFFERING_FLAG_NONE = MEDIA_INFO_UNKNOWN,

        PENDING_BUFFERING_FLAG_START = MEDIA_INFO_BUFFERING_START,

        PENDING_BUFFERING_FLAG_END = MEDIA_INFO_BUFFERING_END,

    };



    // Status of flush responses from the decoder and renderer.

    bool mFlushComplete[2][2];
@@ -215,9 +209,6 @@ private: 
    // still become true, when we pause internally due to buffering.

    bool mPausedByClient;



    // Pending buffering flag which is not sent to client due to being paused.

    PendingBufferingFlag mPendingBufferingFlag;



    // Pause state as requested by source (internally) due to buffering

    bool mPausedForBuffering;