Merge "audio policy: refine TTS stream mute management" into mnc-dr-dev (a09f8cf8) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+15 −2

Original line number	Diff line number	Diff line
		@@ -1066,7 +1066,7 @@ status_t AudioPolicyManager::startSource(sp<AudioOutputDescriptor> outputDesc,
		*delayMs = 0;
		if (stream == AUDIO_STREAM_TTS) {
		ALOGV("\t found BEACON stream");
		if (mOutputs.isAnyOutputActive(AUDIO_STREAM_TTS /streamToIgnore/)) {
		if (!mTtsOutputAvailable && mOutputs.isAnyOutputActive(AUDIO_STREAM_TTS /streamToIgnore/)) {
		return INVALID_OPERATION;
		} else {
		beaconMuteLatency = handleEventForBeacon(STARTING_BEACON);
		@@ -2000,6 +2000,9 @@ status_t AudioPolicyManager::dump(int fd)
		snprintf(buffer, SIZE, " Force use for hdmi system audio %d\n",
		mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO));
		result.append(buffer);
		snprintf(buffer, SIZE, " TTS output %s\n", mTtsOutputAvailable ? "available" : "not available");
		result.append(buffer);

		write(fd, result.string(), result.size());

		mAvailableOutputDevices.dump(fd, String8("output"));
		@@ -2680,7 +2683,8 @@ AudioPolicyManager::AudioPolicyManager(AudioPolicyClientInterface *clientInterfa
		mAudioPortGeneration(1),
		mBeaconMuteRefCount(0),
		mBeaconPlayingRefCount(0),
		mBeaconMuted(false)
		mBeaconMuted(false),
		mTtsOutputAvailable(false)
		{
		audio_policy::EngineInstance *engineInstance = audio_policy::EngineInstance::getInstance();
		if (!engineInstance) {
		@@ -2737,6 +2741,9 @@ AudioPolicyManager::AudioPolicyManager(AudioPolicyClientInterface *clientInterfa
		ALOGW("Output profile contains no device on module %s", mHwModules[i]->mName);
		continue;
		}
		if ((outProfile->mFlags & AUDIO_OUTPUT_FLAG_TTS) != 0) {
		mTtsOutputAvailable = true;
		}

		if ((outProfile->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) != 0) {
		continue;
		@@ -4036,6 +4043,12 @@ void AudioPolicyManager::handleNotificationRoutingForStream(audio_stream_type_t
		}

		uint32_t AudioPolicyManager::handleEventForBeacon(int event) {

		// skip beacon mute management if a dedicated TTS output is available
		if (mTtsOutputAvailable) {
		return 0;
		}

		switch(event) {
		case STARTING_OUTPUT:
		mBeaconMuteRefCount++;

services/audiopolicy/managerdefault/AudioPolicyManager.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -548,6 +548,7 @@ protected:
		uint32_t mBeaconMuteRefCount; // ref count for stream that would mute beacon
		uint32_t mBeaconPlayingRefCount;// ref count for the playing beacon streams
		bool mBeaconMuted; // has STREAM_TTS been muted
		bool mTtsOutputAvailable; // true if a dedicated output for TTS stream is available

		AudioPolicyMixCollection mPolicyMixes; // list of registered mixes