Merge cherrypicks of [19167088, 19210906] into tm-release. (c27abbf3) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -59,10 +59,11 @@ bool AWakeLock::acquire() {
		if (mPowerManager != NULL) {
		sp<IBinder> binder = new BBinder();
		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		binder::Status status = mPowerManager->acquireWakeLockAsync(
		binder::Status status = mPowerManager->acquireWakeLock(
		binder, POWERMANAGER_PARTIAL_WAKE_LOCK,
		String16("AWakeLock"), String16("media"),
		{} /* workSource /, {} / historyTag */);
		{} /* workSource /, {} / historyTag /, -1 / displayId */,
		nullptr /* callback */);
		IPCThreadState::self()->restoreCallingIdentity(token);
		if (status.isOk()) {
		mWakeLockToken = binder;

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+20 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,10 @@ static inline int32_t getAudioSinkPcmMsSetting() {
		// is closed to allow the audio DSP to power down.
		static const int64_t kOffloadPauseMaxUs = 10000000LL;

		// Additional delay after teardown before releasing the wake lock to allow time for the audio path
		// to be completely released
		static const int64_t kWakelockReleaseDelayUs = 2000000LL;

		// Maximum allowed delay from AudioSink, 1.5 seconds.
		static const int64_t kMaxAllowedAudioSinkDelayUs = 1500000LL;

		@@ -793,6 +797,20 @@ void NuPlayer::Renderer::onMessageReceived(const sp<AMessage> &msg) {
		}
		ALOGV("Audio Offload tear down due to pause timeout.");
		onAudioTearDown(kDueToTimeout);
		sp<AMessage> newMsg = new AMessage(kWhatReleaseWakeLock, this);
		newMsg->setInt32("drainGeneration", generation);
		newMsg->post(kWakelockReleaseDelayUs);
		break;
		}

		case kWhatReleaseWakeLock:
		{
		int32_t generation;
		CHECK(msg->findInt32("drainGeneration", &generation));
		if (generation != mAudioOffloadPauseTimeoutGeneration) {
		break;
		}
		ALOGV("releasing audio offload pause wakelock.");
		mWakeLock->release();
		break;
		}
		@@ -1785,6 +1803,8 @@ void NuPlayer::Renderer::onPause() {
		return;
		}

		startAudioOffloadPauseTimeout();

		{
		Mutex::Autolock autoLock(mLock);
		// we do not increment audio drain generation so that we fill audio buffer during pause.
		@@ -1799,7 +1819,6 @@ void NuPlayer::Renderer::onPause() {

		// Note: audio data may not have been decoded, and the AudioSink may not be opened.
		mAudioSink->pause();
		startAudioOffloadPauseTimeout();

		ALOGV("now paused audio queue has %zu entries, video has %zu entries",
		mAudioQueue.size(), mVideoQueue.size());

media/libmediaplayerservice/nuplayer/include/nuplayer/NuPlayerRenderer.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ struct NuPlayer::Renderer : public AHandler {
		kWhatMediaRenderingStart = 'mdrd',
		kWhatAudioTearDown = 'adTD',
		kWhatAudioOffloadPauseTimeout = 'aOPT',
		kWhatReleaseWakeLock = 'adRL',
		};

		enum AudioTearDownReason {