Merge "Invalidate compressed tracks when secondary outputs are changed." (e96eefdf) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+13 −7

Original line number	Diff line number	Diff line
		@@ -5958,6 +5958,11 @@ void AudioPolicyManager::checkSecondaryOutputs() {
		client->getSecondaryOutputs().begin(),
		client->getSecondaryOutputs().end(),
		secondaryDescs.begin(), secondaryDescs.end())) {
		if (!audio_is_linear_pcm(client->config().format)) {
		// If the format is not PCM, the tracks should be invalidated to get correct
		// behavior when the secondary output is changed.
		streamsToInvalidate.insert(client->stream());
		} else {
		std::vector<wp<SwAudioOutputDescriptor>> weakSecondaryDescs;
		std::vector<audio_io_handle_t> secondaryOutputIds;
		for (const auto &secondaryDesc: secondaryDescs) {
		@@ -5969,6 +5974,7 @@ void AudioPolicyManager::checkSecondaryOutputs() {
		}
		}
		}
		}
		if (!trackSecondaryOutputs.empty()) {
		mpClientInterface->updateSecondaryOutputs(trackSecondaryOutputs);
		}