Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"" (23bfa7f3) · Commits · e / os / android_frameworks_base

media/libstagefright/AwesomePlayer.cpp

+0 −13

Original line number	Diff line number	Diff line
		@@ -376,14 +376,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 completed.");
		}

		while (mFlags & PREPARING) {
		mPreparedCondition.wait(mLock);
		}
		@@ -438,8 +431,6 @@ void AwesomePlayer::reset_l() {
		}
		mAudioSource.clear();

		LOGI("audio source cleared");

		mTimeSource = NULL;

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

		LOGI("video source cleared");

		mDurationUs = -1;
		mFlags = 0;
		mExtractorFlags = 0;
		@@ -494,8 +483,6 @@ void AwesomePlayer::reset_l() {
		mFileSource.clear();

		mBitrate = -1;

		LOGI("reset_l completed");
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3289,7 +3289,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);