NuPlayerRenderer: cancelAudioOffloadPauseTimeout() when onDisableOffloadAudio(). am: 3617795ed9 (b9b2d1a3) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -1703,6 +1703,8 @@ void NuPlayer::Renderer::onDisableOffloadAudio() {
		++mAudioDrainGeneration;
		if (mAudioRenderingStartGeneration != -1) {
		prepareForMediaRenderingStart_l();
		// PauseTimeout is applied to offload mode only. Cancel pending timer.
		cancelAudioOffloadPauseTimeout();
		}
		}

		@@ -1805,6 +1807,12 @@ void NuPlayer::Renderer::onAudioTearDown(AudioTearDownReason reason) {
		if (mAudioTornDown) {
		return;
		}

		// TimeoutWhenPaused is only for offload mode.
		if (reason == kDueToTimeout && !offloadingAudio()) {
		return;
		}

		mAudioTornDown = true;

		int64_t currentPositionUs;