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

Commit 2c17f05a authored by James Dong's avatar James Dong
Browse files

Revert "Add some logging to track down where ANR happens during MediaPlayer._release()." 

This reverts commit a5293d1c.

Conflicts:

	media/libstagefright/AwesomePlayer.cpp

Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
parent 9cba6863

media/libstagefright/AwesomePlayer.cpp

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



void AwesomePlayer::reset() {

    LOGI("reset");

    Mutex::Autolock autoLock(mLock);

    reset_l();

}
@@ -467,10 +466,8 @@ 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)) {
@@ -503,7 +500,6 @@ void AwesomePlayer::reset_l() { 
        mPreparedCondition.wait(mLock);

    }



    LOGI("cancel player events");

    cancelPlayerEvents();



    mWVMExtractor.clear();

media/libstagefright/OMXCodec.cpp

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



status_t OMXCodec::stop() {

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

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



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

    }



    CODEC_LOGI("stopping video source");

    mSource->stop();



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