Merge "APM: Notify the client about new audio ports" into rvc-dev am: 7bb5d6abf9 (5ba2d376) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+24 −13

Original line number	Diff line number	Diff line
		@@ -133,12 +133,14 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t deviceT
		sp<DeviceDescriptor> device =
		mHwModules.getDeviceDescriptor(deviceType, device_address, device_name, encodedFormat,
		state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE);
		if (device == 0) {
		return INVALID_OPERATION;
		return device ? setDeviceConnectionStateInt(device, state) : INVALID_OPERATION;
		}

		status_t AudioPolicyManager::setDeviceConnectionStateInt(const sp<DeviceDescriptor> &device,
		audio_policy_dev_state_t state)
		{
		// handle output devices
		if (audio_is_output_device(deviceType)) {
		if (audio_is_output_device(device->type())) {
		SortedVector <audio_io_handle_t> outputs;

		ssize_t index = mAvailableOutputDevices.indexOf(device);
		@@ -155,7 +157,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t deviceT
		return INVALID_OPERATION;
		}
		ALOGV("%s() connecting device %s format %x",
		__func__, device->toString().c_str(), encodedFormat);
		__func__, device->toString().c_str(), device->getEncodedFormat());

		// register new device as available
		if (mAvailableOutputDevices.add(device) < 0) {
		@@ -217,16 +219,13 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t deviceT
		// output device used by a dynamic policy of type recorder as no
		// playback use case is affected.
		bool doCheckForDeviceAndOutputChanges = true;
		if (device->type() == AUDIO_DEVICE_OUT_REMOTE_SUBMIX
		&& strncmp(device_address, "0", AUDIO_DEVICE_MAX_ADDRESS_LEN) != 0) {
		if (device->type() == AUDIO_DEVICE_OUT_REMOTE_SUBMIX && device->address() != "0") {
		for (audio_io_handle_t output : outputs) {
		sp<SwAudioOutputDescriptor> desc = mOutputs.valueFor(output);
		sp<AudioPolicyMix> policyMix = desc->mPolicyMix.promote();
		if (policyMix != nullptr
		&& policyMix->mMixType == MIX_TYPE_RECORDERS
		&& strncmp(device_address,
		policyMix->mDeviceAddress.string(),
		AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0) {
		&& device->address() == policyMix->mDeviceAddress.string()) {
		doCheckForDeviceAndOutputChanges = false;
		break;
		}
		@@ -272,7 +271,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t deviceT
		// a valid device selection on those outputs.
		bool force = (msdOutDevices.isEmpty() \|\| msdOutDevices != desc->devices())
		&& !desc->isDuplicated()
		&& (!device_distinguishes_on_address(deviceType)
		&& (!device_distinguishes_on_address(device->type())
		// always force when disconnecting (a non-duplicated device)
		\|\| (state == AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE));
		setOutputDevices(desc, newDevices, force, 0);
		@@ -288,7 +287,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t deviceT
		} // end if is output device

		// handle input devices
		if (audio_is_input_device(deviceType)) {
		if (audio_is_input_device(device->type())) {
		ssize_t index = mAvailableInputDevices.indexOf(device);
		switch (state)
		{
		@@ -4444,7 +4443,7 @@ status_t AudioPolicyManager::initialize() {

		// after parsing the config, mOutputDevicesAll and mInputDevicesAll contain all known devices;
		// open all output streams needed to access attached devices
		onNewAudioModulesAvailable();
		onNewAudioModulesAvailableInt(nullptr /newDevices/);

		// make sure default device is reachable
		if (mDefaultOutputDevice == 0 \|\| !mAvailableOutputDevices.contains(mDefaultOutputDevice)) {
		@@ -4500,6 +4499,16 @@ status_t AudioPolicyManager::initCheck()
		// ---

		void AudioPolicyManager::onNewAudioModulesAvailable()
		{
		DeviceVector newDevices;
		onNewAudioModulesAvailableInt(&newDevices);
		if (!newDevices.empty()) {
		nextAudioPortGeneration();
		mpClientInterface->onAudioPortListUpdate();
		}
		}

		void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices)
		{
		for (const auto& hwModule : mHwModulesAll) {
		if (std::find(mHwModules.begin(), mHwModules.end(), hwModule) != mHwModules.end()) {
		@@ -4564,6 +4573,7 @@ void AudioPolicyManager::onNewAudioModulesAvailable()
		if (!device->isAttached()) {
		device->attach(hwModule);
		mAvailableOutputDevices.add(device);
		if (newDevices) newDevices->add(device);
		setEngineDeviceConnectionState(device, AUDIO_POLICY_DEVICE_STATE_AVAILABLE);
		}
		}
		@@ -4619,6 +4629,7 @@ void AudioPolicyManager::onNewAudioModulesAvailable()
		device->attach(hwModule);
		device->importAudioPortAndPickAudioProfile(inProfile, true);
		mAvailableInputDevices.add(device);
		if (newDevices) newDevices->add(device);
		setEngineDeviceConnectionState(device, AUDIO_POLICY_DEVICE_STATE_AVAILABLE);
		}
		}

services/audiopolicy/managerdefault/AudioPolicyManager.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -788,6 +788,8 @@ protected:

		std::unordered_map<uid_t, audio_flags_mask_t> mAllowedCapturePolicies;
		private:
		void onNewAudioModulesAvailableInt(DeviceVector *newDevices);

		// Add or remove AC3 DTS encodings based on user preferences.
		void modifySurroundFormats(const sp<DeviceDescriptor>& devDesc, FormatVector *formatsPtr);
		void modifySurroundChannelMasks(ChannelMaskSet *channelMasksPtr);
		@@ -878,6 +880,8 @@ private:
		const char *device_address,
		const char *device_name,
		audio_format_t encodedFormat);
		status_t setDeviceConnectionStateInt(const sp<DeviceDescriptor> &device,
		audio_policy_dev_state_t state);

		void setEngineDeviceConnectionState(const sp<DeviceDescriptor> device,
		audio_policy_dev_state_t state);

services/audiopolicy/service/AudioPolicyService.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1876,7 +1876,7 @@ void AudioPolicyService::setEffectSuspended(int effectId,

		void AudioPolicyService::onNewAudioModulesAvailable()
		{
		mAudioCommandThread->audioModulesUpdateCommand();
		mOutputCommandThread->audioModulesUpdateCommand();
		}

services/audiopolicy/tests/AudioPolicyManagerTestClient.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,10 @@ public:
		return NO_ERROR;
		}

		void onAudioPortListUpdate() override {
		++mAudioPortListUpdateCount;
		}

		// Helper methods for tests
		size_t getActivePatchesCount() const { return mActivePatches.size(); }

		@@ -111,12 +115,15 @@ public:
		mAllowedModuleNames.swap(names);
		}

		size_t getAudioPortListUpdateCount() const { return mAudioPortListUpdateCount; }

		private:
		audio_module_handle_t mNextModuleHandle = AUDIO_MODULE_HANDLE_NONE + 1;
		audio_io_handle_t mNextIoHandle = AUDIO_IO_HANDLE_NONE + 1;
		audio_patch_handle_t mNextPatchHandle = AUDIO_PATCH_HANDLE_NONE + 1;
		std::map<audio_patch_handle_t, struct audio_patch> mActivePatches;
		std::set<std::string> mAllowedModuleNames;
		size_t mAudioPortListUpdateCount = 0;
		};

		} // namespace android

services/audiopolicy/tests/AudioPolicyTestManager.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ class AudioPolicyTestManager : public AudioPolicyManager {
		using AudioPolicyManager::getOutputs;
		using AudioPolicyManager::getAvailableOutputDevices;
		using AudioPolicyManager::getAvailableInputDevices;
		uint32_t getAudioPortGeneration() const { return mAudioPortGeneration; }
		};

		} // namespace android