am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev (add3dfc4) · Commits · e / os / android_frameworks_av

media/libstagefright/AwesomePlayer.cpp

+17 −9

Original line number	Diff line number	Diff line
		@@ -1707,7 +1707,8 @@ void AwesomePlayer::onVideoEvent() {
		}
		}

		if ((mFlags & TEXTPLAYER_INITIALIZED) && !(mFlags & (TEXT_RUNNING \| SEEK_PREVIEW))) {
		if ((mFlags & TEXTPLAYER_INITIALIZED)
		&& !(mFlags & (TEXT_RUNNING \| SEEK_PREVIEW))) {
		mTextDriver->start();
		modifyFlags(TEXT_RUNNING, SET);
		}
		@@ -1753,6 +1754,7 @@ void AwesomePlayer::onVideoEvent() {
		&& mAudioPlayer != NULL
		&& mAudioPlayer->getMediaTimeMapping(
		&realTimeUs, &mediaTimeUs)) {
		if (mWVMExtractor == NULL) {
		ALOGI("we're much too late (%.2f secs), video skipping ahead",
		latenessUs / 1E6);

		@@ -1764,6 +1766,12 @@ void AwesomePlayer::onVideoEvent() {

		postVideoEvent_l();
		return;
		} else {
		// The widevine extractor doesn't deal well with seeking
		// audio and video independently. We'll just have to wait
		// until the decoder catches up, which won't be long at all.
		ALOGI("we're very late (%.2f secs)", latenessUs / 1E6);
		}
		}

		if (latenessUs > 40000) {