Merge "NuPlayer: fix out of range seeking in audio" (2d6bb6e3) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1234,7 +1234,7 @@ status_t NuPlayer::GenericSource::doSeek(int64_t seekTimeUs, MediaPlayerSeekMode
		}

		if (mAudioTrack.mSource != NULL) {
		readBuffer(MEDIA_TRACK_TYPE_AUDIO, seekTimeUs);
		readBuffer(MEDIA_TRACK_TYPE_AUDIO, seekTimeUs, MediaPlayerSeekMode::SEEK_CLOSEST);
		mAudioLastDequeueTimeUs = seekTimeUs;
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -750,12 +750,20 @@ bool NuPlayer::Decoder::handleAnOutputBuffer(

		buffer->meta()->setInt32("eos", true);
		reply->setInt32("eos", true);
		} else if (mSkipRenderingUntilMediaTimeUs >= 0) {
		}

		if (mSkipRenderingUntilMediaTimeUs >= 0) {
		if (timeUs < mSkipRenderingUntilMediaTimeUs) {
		ALOGV("[%s] dropping buffer at time %lld as requested.",
		mComponentName.c_str(), (long long)timeUs);

		reply->post();
		if (eos) {
		notifyResumeCompleteIfNecessary();
		if (mRenderer != NULL && !isDiscontinuityPending()) {
		mRenderer->queueEOS(mIsAudio, ERROR_END_OF_STREAM);
		}
		}
		return true;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -1429,6 +1429,7 @@ void NuPlayer::Renderer::notifyEOS_l(bool audio, status_t finalResult, int64_t d
		if (audio) {
		// Video might outlive audio. Clear anchor to enable video only case.
		mAnchorTimeMediaUs = -1;
		mHasAudio = false;
		}
		}