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

Commit d6c276a5 authored by Carl Shapiro's avatar Carl Shapiro
Browse files

Revert "Make AwesomePlayer's reset process more verbose to track down ANRs." 

This reverts commit 90c65657.

Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
parent 63d64a14

media/libstagefright/AwesomePlayer.cpp

+0 −13
Original line number Diff line number Diff line
@@ -378,14 +378,11 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { 
}



void AwesomePlayer::reset() {

    LOGI("reset");



    Mutex::Autolock autoLock(mLock);

    reset_l();

}



void AwesomePlayer::reset_l() {

    LOGI("reset_l");

    mDisplayWidth = 0;

    mDisplayHeight = 0;
@@ -411,10 +408,6 @@ void AwesomePlayer::reset_l() { 
        }

    }



    if (mFlags & PREPARING) {

        LOGI("waiting until preparation is completes.");

    }



    while (mFlags & PREPARING) {

        mPreparedCondition.wait(mLock);

    }
@@ -438,8 +431,6 @@ void AwesomePlayer::reset_l() { 
    }

    mAudioSource.clear();



    LOGI("audio source cleared");



    mTimeSource = NULL;



    delete mAudioPlayer;
@@ -480,8 +471,6 @@ void AwesomePlayer::reset_l() { 
        IPCThreadState::self()->flushCommands();

    }



    LOGI("video source cleared");



    mDurationUs = -1;

    mFlags = 0;

    mExtractorFlags = 0;
@@ -498,8 +487,6 @@ void AwesomePlayer::reset_l() { 
    mFileSource.clear();



    mBitrate = -1;



    LOGI("reset_l completed");

}



void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {