Merge changes from topic "mvAudioDeviceTypeAddr" am: 0287266a3e (decaebce) · Commits · e / os / android_frameworks_av

media/libaudioclient/Android.bp

+11 −1

Original line number	Diff line number	Diff line
		cc_library_headers {
		name: "libaudioclient_headers",
		vendor_available: true,
		export_include_dirs: ["include"],
		header_libs: [
		"libaudiofoundation_headers",
		],
		export_include_dirs: [
		"include",
		],
		export_header_lib_headers: [
		"libaudiofoundation_headers",
		],
		}

		cc_library_shared {
		@@ -13,6 +21,7 @@ cc_library_shared {
		"AudioVolumeGroup.cpp",
		],
		shared_libs: [
		"libaudiofoundation",
		"libaudioutils",
		"libbinder",
		"libcutils",
		@@ -63,6 +72,7 @@ cc_library_shared {
		"TrackPlayerBase.cpp",
		],
		shared_libs: [
		"libaudiofoundation",
		"libaudioutils",
		"libaudiopolicy",
		"libaudiomanager",

media/libaudioclient/AudioPolicy.cpp

+0 −16

Original line number	Diff line number	Diff line
		@@ -21,22 +21,6 @@

		namespace android {

		//
		// AudioDeviceTypeAddr implementation
		//
		status_t AudioDeviceTypeAddr::readFromParcel(Parcel *parcel) {
		mType = (audio_devices_t) parcel->readInt32();
		mAddress = parcel->readString8();
		return NO_ERROR;
		}

		status_t AudioDeviceTypeAddr::writeToParcel(Parcel *parcel) const {
		parcel->writeInt32((int32_t) mType);
		parcel->writeString8(mAddress);
		return NO_ERROR;
		}


		//
		// AudioMixMatchCriterion implementation
		//

media/libaudioclient/IAudioFlinger.cpp

+10 −11

Original line number	Diff line number	Diff line
		@@ -392,20 +392,18 @@ public:
		virtual status_t openOutput(audio_module_handle_t module,
		audio_io_handle_t *output,
		audio_config_t *config,
		audio_devices_t *devices,
		const String8& address,
		const sp<DeviceDescriptorBase>& device,
		uint32_t *latencyMs,
		audio_output_flags_t flags)
		{
		if (output == NULL \|\| config == NULL \|\| devices == NULL \|\| latencyMs == NULL) {
		if (output == nullptr \|\| config == nullptr \|\| device == nullptr \|\| latencyMs == nullptr) {
		return BAD_VALUE;
		}
		Parcel data, reply;
		data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
		data.writeInt32(module);
		data.write(config, sizeof(audio_config_t));
		data.writeInt32(*devices);
		data.writeString8(address);
		data.writeParcelable(*device);
		data.writeInt32((int32_t) flags);
		status_t status = remote()->transact(OPEN_OUTPUT, data, &reply);
		if (status != NO_ERROR) {
		@@ -420,7 +418,6 @@ public:
		*output = (audio_io_handle_t)reply.readInt32();
		ALOGV("openOutput() returned output, %d", *output);
		reply.read(config, sizeof(audio_config_t));
		*devices = (audio_devices_t)reply.readInt32();
		*latencyMs = reply.readInt32();
		return NO_ERROR;
		}
		@@ -1200,19 +1197,21 @@ status_t BnAudioFlinger::onTransact(
		if (data.read(&config, sizeof(audio_config_t)) != NO_ERROR) {
		ALOGE("b/23905951");
		}
		audio_devices_t devices = (audio_devices_t)data.readInt32();
		String8 address(data.readString8());
		sp<DeviceDescriptorBase> device = new DeviceDescriptorBase(AUDIO_DEVICE_NONE);
		status_t status = NO_ERROR;
		if ((status = data.readParcelable(device.get())) != NO_ERROR) {
		reply->writeInt32((int32_t)status);
		return NO_ERROR;
		}
		audio_output_flags_t flags = (audio_output_flags_t) data.readInt32();
		uint32_t latencyMs = 0;
		audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
		status_t status = openOutput(module, &output, &config,
		&devices, address, &latencyMs, flags);
		status = openOutput(module, &output, &config, device, &latencyMs, flags);
		ALOGV("OPEN_OUTPUT output, %d", output);
		reply->writeInt32((int32_t)status);
		if (status == NO_ERROR) {
		reply->writeInt32((int32_t)output);
		reply->write(&config, sizeof(audio_config_t));
		reply->writeInt32(devices);
		reply->writeInt32(latencyMs);
		}
		return NO_ERROR;

media/libaudioclient/include/media/AudioPolicy.h

+2 −14

Original line number	Diff line number	Diff line
		@@ -18,9 +18,10 @@
		#ifndef ANDROID_AUDIO_POLICY_H
		#define ANDROID_AUDIO_POLICY_H

		#include <binder/Parcel.h>
		#include <media/AudioDeviceTypeAddr.h>
		#include <system/audio.h>
		#include <system/audio_policy.h>
		#include <binder/Parcel.h>
		#include <utils/String8.h>
		#include <utils/Vector.h>

		@@ -60,19 +61,6 @@ namespace android {
		#define MAX_MIXES_PER_POLICY 10
		#define MAX_CRITERIA_PER_MIX 20

		class AudioDeviceTypeAddr {
		public:
		AudioDeviceTypeAddr() {}
		AudioDeviceTypeAddr(audio_devices_t type, String8 address) :
		mType(type), mAddress(address) {}

		status_t readFromParcel(Parcel *parcel);
		status_t writeToParcel(Parcel *parcel) const;

		audio_devices_t mType;
		String8 mAddress;
		};

		class AudioMixMatchCriterion {
		public:
		AudioMixMatchCriterion() {}

media/libaudioclient/include/media/AudioSystem.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#include <sys/types.h>

		#include <media/AudioDeviceTypeAddr.h>
		#include <media/AudioPolicy.h>
		#include <media/AudioProductStrategy.h>
		#include <media/AudioVolumeGroup.h>