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

Commit bd6ac1e4 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track... 

am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb

* commit 'da6f9295':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)
parents 47254778 da6f9295

media/libstagefright/AwesomePlayer.cpp

+13 −0
Original line number Diff line number Diff line
@@ -378,11 +378,14 @@ 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;
@@ -408,6 +411,10 @@ void AwesomePlayer::reset_l() { 
        }

    }



    if (mFlags & PREPARING) {

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

    }



    while (mFlags & PREPARING) {

        mPreparedCondition.wait(mLock);

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

    mAudioSource.clear();



    LOGI("audio source cleared");



    mTimeSource = NULL;



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

    }



    LOGI("video source cleared");



    mDurationUs = -1;

    mFlags = 0;

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



    mBitrate = -1;



    LOGI("reset_l completed");

}



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