Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev (6134ad6f) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -1474,10 +1474,12 @@ void NuPlayer::determineAudioModeChange() {
		sp<AMessage> format = mSource->getFormat(true /audio/);
		tryOpenAudioSinkForOffload(format, hasVideo);
		} else {
		if (mOffloadAudio) {
		mRenderer->signalDisableOffloadAudio();
		mOffloadAudio = false;
		}
		}
		}

		status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {
		if (*decoder != NULL) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -1422,12 +1422,18 @@ void NuPlayer::Renderer::onDisableOffloadAudio() {
		Mutex::Autolock autoLock(mLock);
		mFlags &= ~FLAG_OFFLOAD_AUDIO;
		++mAudioDrainGeneration;
		if (mAudioRenderingStartGeneration != -1) {
		prepareForMediaRenderingStart_l();
		}
		}

		void NuPlayer::Renderer::onEnableOffloadAudio() {
		Mutex::Autolock autoLock(mLock);
		mFlags \|= FLAG_OFFLOAD_AUDIO;
		++mAudioDrainGeneration;
		if (mAudioRenderingStartGeneration != -1) {
		prepareForMediaRenderingStart_l();
		}
		}

		void NuPlayer::Renderer::onPause() {