Merge "Return DeviceDescriptor or DeviceVector in Engine." (c48ed667) · Commits · e / devices / smdk4412 / android_frameworks_av

services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,13 @@ public:
	DeviceVector getDevicesFromHwModule(audio_module_handle_t moduleHandle) const;		DeviceVector getDevicesFromHwModule(audio_module_handle_t moduleHandle) const;
	audio_devices_t getDeviceTypesFromHwModule(audio_module_handle_t moduleHandle) const;		audio_devices_t getDeviceTypesFromHwModule(audio_module_handle_t moduleHandle) const;

			DeviceVector getFirstDevicesFromTypes(std::vector<audio_devices_t> orderedTypes) const;
			sp<DeviceDescriptor> getFirstExistingDevice(std::vector<audio_devices_t> orderedTypes) const;

			// If there are devices with the given type and the devices to add is not empty,
			// remove all the devices with the given type and add all the devices to add.
			void replaceDevicesByType(audio_devices_t typeToRemove, const DeviceVector &devicesToAdd);

	bool contains(const sp<DeviceDescriptor>& item) const { return indexOf(item) >= 0; }		bool contains(const sp<DeviceDescriptor>& item) const { return indexOf(item) >= 0; }

	/**		/**

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

+32 −1

Original line number	Original line	Diff line number	Diff line
	@@ -255,7 +255,6 @@ DeviceVector DeviceVector::getDevicesFromTypeMask(audio_devices_t type) const
	audio_devices_t curType = itemAt(i)->type() & ~AUDIO_DEVICE_BIT_IN;		audio_devices_t curType = itemAt(i)->type() & ~AUDIO_DEVICE_BIT_IN;
	if ((isOutput == curIsOutput) && ((type & curType) != 0)) {		if ((isOutput == curIsOutput) && ((type & curType) != 0)) {
	devices.add(itemAt(i));		devices.add(itemAt(i));
	type &= ~curType;
	ALOGV("DeviceVector::%s() for type %08x found %p",		ALOGV("DeviceVector::%s() for type %08x found %p",
	__func__, itemAt(i)->type(), itemAt(i).get());		__func__, itemAt(i)->type(), itemAt(i).get());
	}		}
	@@ -273,6 +272,38 @@ sp<DeviceDescriptor> DeviceVector::getDeviceFromTagName(const String8 &tagName)
	return nullptr;		return nullptr;
	}		}

			DeviceVector DeviceVector::getFirstDevicesFromTypes(
			std::vector<audio_devices_t> orderedTypes) const
			{
			DeviceVector devices;
			for (auto deviceType : orderedTypes) {
			if (!(devices = getDevicesFromTypeMask(deviceType)).isEmpty()) {
			break;
			}
			}
			return devices;
			}

			sp<DeviceDescriptor> DeviceVector::getFirstExistingDevice(
			std::vector<audio_devices_t> orderedTypes) const {
			sp<DeviceDescriptor> device;
			for (auto deviceType : orderedTypes) {
			if ((device = getDevice(deviceType, String8(""), AUDIO_FORMAT_DEFAULT)) != nullptr) {
			break;
			}
			}
			return device;
			}

			void DeviceVector::replaceDevicesByType(
			audio_devices_t typeToRemove, const DeviceVector &devicesToAdd) {
			DeviceVector devicesToRemove = getDevicesFromTypeMask(typeToRemove);
			if (!devicesToRemove.isEmpty() && !devicesToAdd.isEmpty()) {
			remove(devicesToRemove);
			add(devicesToAdd);
			}
			}

	void DeviceVector::dump(String8 *dst, const String8 &tag, int spaces, bool verbose) const		void DeviceVector::dump(String8 *dst, const String8 &tag, int spaces, bool verbose) const
	{		{
	if (isEmpty()) {		if (isEmpty()) {