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

Commit 4c811929 authored by Carl Shapiro's avatar Carl Shapiro Committed by Android Git Automerger
Browse files

am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose... 

am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb

* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
parents e8600e37 8aded52c

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) {