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

Commit e16b2955 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started"

parents a4497ccd bd8fbfa9

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

+4 −2
Original line number Diff line number Diff line
@@ -58,9 +58,11 @@ NuPlayer::HTTPLiveSource::HTTPLiveSource( 
}



NuPlayer::HTTPLiveSource::~HTTPLiveSource() {

    if (mLiveSession != NULL) {

        mLiveSession->disconnect();

        mLiveLooper->stop();

    }

}



void NuPlayer::HTTPLiveSource::start() {

    mLiveLooper = new ALooper;

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+7 −1
Original line number Diff line number Diff line
@@ -118,9 +118,15 @@ status_t NuPlayerDriver::start() { 
            mPlayer->start();



            if (mStartupSeekTimeUs >= 0) {

                if (mStartupSeekTimeUs == 0) {

                    notifySeekComplete();

                } else {

                    mPlayer->seekToAsync(mStartupSeekTimeUs);

                }



                mStartupSeekTimeUs = -1;

            }



            break;

        }

        case PLAYING: