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

Commit 9eff287f authored by James Dong's avatar James Dong
Browse files

resolved conflicts for merge of d5762583 to master 

Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
parents 162f7d15 77a88767

media/libstagefright/AwesomePlayer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { 
}



void AwesomePlayer::reset() {

    LOGI("reset");

    Mutex::Autolock autoLock(mLock);

    reset_l();

}
@@ -413,8 +414,10 @@ void AwesomePlayer::reset_l() { 
                    Playback::STOP, 0);

            mDecryptHandle = NULL;

            mDrmManagerClient = NULL;

            LOGI("DRM manager client stopped");

    }





    if (mFlags & PLAYING) {

        uint32_t params = IMediaPlayerService::kBatteryDataTrackDecoder;

        if ((mAudioSource != NULL) && (mAudioSource != mAudioTrack)) {
@@ -447,6 +450,7 @@ void AwesomePlayer::reset_l() { 
        mPreparedCondition.wait(mLock);

    }



    LOGI("cancel player events");

    cancelPlayerEvents();



    mWVMExtractor.clear();
@@ -1081,6 +1085,7 @@ void AwesomePlayer::shutdownVideoDecoder_l() { 
        usleep(1000);

    }

    IPCThreadState::self()->flushCommands();

    LOGI("video decoder shutdown completed");

}



void AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) {

media/libstagefright/OMXCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3443,7 +3443,7 @@ status_t OMXCodec::start(MetaData *meta) { 
}



status_t OMXCodec::stop() {

    CODEC_LOGV("stop mState=%d", mState);

    CODEC_LOGI("stop mState=%d", mState);



    Mutex::Autolock autoLock(mLock);
@@ -3505,6 +3505,7 @@ status_t OMXCodec::stop() { 
        mLeftOverBuffer = NULL;

    }



    CODEC_LOGI("stopping video source");

    mSource->stop();



    CODEC_LOGI("stopped in state %d", mState);