Merge "Avoid querying the audio service twice" (aa3807ae) · Commits · e / os / android_frameworks_av

media/libaudiohal/DevicesFactoryHalInterface.cpp

+6 −14

Original line number	Diff line number	Diff line
		@@ -14,26 +14,18 @@
		* limitations under the License.
		*/

		#include <android/hardware/audio/2.0/IDevicesFactory.h>
		#include <android/hardware/audio/4.0/IDevicesFactory.h>
		#include <android/hardware/audio/5.0/IDevicesFactory.h>

		#include <libaudiohal/FactoryHalHidl.h>

		#include <media/audiohal/DevicesFactoryHalInterface.h>

		namespace android {

		// static
		sp<DevicesFactoryHalInterface> DevicesFactoryHalInterface::create() {
		if (hardware::audio::V5_0::IDevicesFactory::getService() != nullptr) {
		return V5_0::createDevicesFactoryHal();
		}
		if (hardware::audio::V4_0::IDevicesFactory::getService() != nullptr) {
		return V4_0::createDevicesFactoryHal();
		}
		if (hardware::audio::V2_0::IDevicesFactory::getService() != nullptr) {
		return V2_0::createDevicesFactoryHal();
		}
		return nullptr;
		return V5_0::createDevicesFactoryHal() ?:
		V4_0::createDevicesFactoryHal() ?:
		V2_0::createDevicesFactoryHal() ?:
		nullptr;
		}

		} // namespace android

+4 −10

Original line number	Diff line number	Diff line
		@@ -24,16 +24,10 @@ namespace android {

		// static
		sp<EffectsFactoryHalInterface> EffectsFactoryHalInterface::create() {
		if (hardware::audio::effect::V5_0::IEffectsFactory::getService() != nullptr) {
		return effect::V5_0::createEffectsFactoryHal();
		}
		if (hardware::audio::effect::V4_0::IEffectsFactory::getService() != nullptr) {
		return effect::V4_0::createEffectsFactoryHal();
		}
		if (hardware::audio::effect::V2_0::IEffectsFactory::getService() != nullptr) {
		return effect::V2_0::createEffectsFactoryHal();
		}
		return nullptr;
		return effect::V5_0::createEffectsFactoryHal() ?:
		effect::V4_0::createEffectsFactoryHal() ?:
		effect::V2_0::createEffectsFactoryHal() ?:
		nullptr;
		}

		// static

+4 −7

Original line number	Diff line number	Diff line
		@@ -35,13 +35,10 @@ using ::android::hardware::Return;
		namespace android {
		namespace CPP_VERSION {

		DevicesFactoryHalHidl::DevicesFactoryHalHidl() {
		sp<IDevicesFactory> defaultFactory{IDevicesFactory::getService()};
		if (!defaultFactory) {
		ALOGE("Failed to obtain IDevicesFactory/default service, terminating process.");
		exit(1);
		}
		mDeviceFactories.push_back(defaultFactory);
		DevicesFactoryHalHidl::DevicesFactoryHalHidl(sp<IDevicesFactory> devicesFactory) {
		ALOG_ASSERT(devicesFactory != nullptr, "Provided IDevicesFactory service is NULL");

		mDeviceFactories.push_back(devicesFactory);
		if (MAJOR_VERSION >= 4) {
		// The MSD factory is optional and only available starting at HAL 4.0
		sp<IDevicesFactory> msdFactory{IDevicesFactory::getService(AUDIO_HAL_SERVICE_NAME_MSD)};

+2 −6

Original line number	Diff line number	Diff line
		@@ -32,18 +32,14 @@ namespace CPP_VERSION {
		class DevicesFactoryHalHidl : public DevicesFactoryHalInterface
		{
		public:
		DevicesFactoryHalHidl(sp<IDevicesFactory> devicesFactory);

		// Opens a device with the specified name. To close the device, it is
		// necessary to release references to the returned object.
		virtual status_t openDevice(const char name, sp<DeviceHalInterface> device);

		private:
		friend class DevicesFactoryHalHybrid;

		std::vector<sp<IDevicesFactory>> mDeviceFactories;

		// Can not be constructed directly by clients.
		DevicesFactoryHalHidl();

		virtual ~DevicesFactoryHalHidl() = default;
		};

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,9 +24,9 @@
		namespace android {
		namespace CPP_VERSION {

		DevicesFactoryHalHybrid::DevicesFactoryHalHybrid()
		DevicesFactoryHalHybrid::DevicesFactoryHalHybrid(sp<IDevicesFactory> hidlFactory)
		: mLocalFactory(new DevicesFactoryHalLocal()),
		mHidlFactory(new DevicesFactoryHalHidl()) {
		mHidlFactory(new DevicesFactoryHalHidl(hidlFactory)) {
		}

		status_t DevicesFactoryHalHybrid::openDevice(const char name, sp<DeviceHalInterface> device) {