Merge "Use audio_port_v7 in audio policy." (4e2d2a5c) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioSystem.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1199,7 +1199,7 @@ bool AudioSystem::isOffloadSupported(const audio_offload_info_t& info)
		status_t AudioSystem::listAudioPorts(audio_port_role_t role,
		audio_port_type_t type,
		unsigned int *num_ports,
		struct audio_port *ports,
		struct audio_port_v7 *ports,
		unsigned int *generation)
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		@@ -1207,7 +1207,7 @@ status_t AudioSystem::listAudioPorts(audio_port_role_t role,
		return aps->listAudioPorts(role, type, num_ports, ports, generation);
		}

		status_t AudioSystem::getAudioPort(struct audio_port *port)
		status_t AudioSystem::getAudioPort(struct audio_port_v7 *port)
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return PERMISSION_DENIED;

media/libaudioclient/IAudioPolicyService.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -688,7 +688,7 @@ public:
		virtual status_t listAudioPorts(audio_port_role_t role,
		audio_port_type_t type,
		unsigned int *num_ports,
		struct audio_port *ports,
		struct audio_port_v7 *ports,
		unsigned int *generation)
		{
		if (num_ports == NULL \|\| (*num_ports != 0 && ports == NULL) \|\|
		@@ -711,27 +711,27 @@ public:
		numPortsReq = *num_ports;
		}
		if (numPortsReq > 0) {
		reply.read(ports, numPortsReq * sizeof(struct audio_port));
		reply.read(ports, numPortsReq * sizeof(struct audio_port_v7));
		}
		*generation = reply.readInt32();
		}
		return status;
		}

		virtual status_t getAudioPort(struct audio_port *port)
		virtual status_t getAudioPort(struct audio_port_v7 *port)
		{
		if (port == NULL) {
		return BAD_VALUE;
		}
		Parcel data, reply;
		data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
		data.write(port, sizeof(struct audio_port));
		data.write(port, sizeof(struct audio_port_v7));
		status_t status = remote()->transact(GET_AUDIO_PORT, data, &reply);
		if (status != NO_ERROR \|\|
		(status = (status_t)reply.readInt32()) != NO_ERROR) {
		return status;
		}
		reply.read(port, sizeof(struct audio_port));
		reply.read(port, sizeof(struct audio_port_v7));
		return status;
		}

		@@ -2183,8 +2183,8 @@ status_t BnAudioPolicyService::onTransact(
		numPortsReq = MAX_ITEMS_PER_LIST;
		}
		unsigned int numPorts = numPortsReq;
		struct audio_port *ports =
		(struct audio_port *)calloc(numPortsReq, sizeof(struct audio_port));
		struct audio_port_v7 *ports =
		(struct audio_port_v7 *)calloc(numPortsReq, sizeof(struct audio_port_v7));
		if (ports == NULL) {
		reply->writeInt32(NO_MEMORY);
		reply->writeInt32(0);
		@@ -2199,7 +2199,7 @@ status_t BnAudioPolicyService::onTransact(
		if (numPortsReq > numPorts) {
		numPortsReq = numPorts;
		}
		reply->write(ports, numPortsReq * sizeof(struct audio_port));
		reply->write(ports, numPortsReq * sizeof(struct audio_port_v7));
		reply->writeInt32(generation);
		}
		free(ports);
		@@ -2208,8 +2208,8 @@ status_t BnAudioPolicyService::onTransact(

		case GET_AUDIO_PORT: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);
		struct audio_port port = {};
		status_t status = data.read(&port, sizeof(struct audio_port));
		struct audio_port_v7 port = {};
		status_t status = data.read(&port, sizeof(struct audio_port_v7));
		if (status != NO_ERROR) {
		ALOGE("b/23912202");
		return status;
		@@ -2220,7 +2220,7 @@ status_t BnAudioPolicyService::onTransact(
		}
		reply->writeInt32(status);
		if (status == NO_ERROR) {
		reply->write(&port, sizeof(struct audio_port));
		reply->write(&port, sizeof(struct audio_port_v7));
		}
		return NO_ERROR;
		}

media/libaudioclient/include/media/AudioSystem.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -331,11 +331,11 @@ public:
		static status_t listAudioPorts(audio_port_role_t role,
		audio_port_type_t type,
		unsigned int *num_ports,
		struct audio_port *ports,
		struct audio_port_v7 *ports,
		unsigned int *generation);

		/* Get attributes for a given audio port */
		static status_t getAudioPort(struct audio_port *port);
		static status_t getAudioPort(struct audio_port_v7 *port);

		/* Create an audio patch between several source and sink ports */
		static status_t createAudioPatch(const struct audio_patch *patch,

media/libaudioclient/include/media/IAudioPolicyService.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,11 +160,11 @@ public:
		virtual status_t listAudioPorts(audio_port_role_t role,
		audio_port_type_t type,
		unsigned int *num_ports,
		struct audio_port *ports,
		struct audio_port_v7 *ports,
		unsigned int *generation) = 0;

		/* Get attributes for a given audio port */
		virtual status_t getAudioPort(struct audio_port *port) = 0;
		virtual status_t getAudioPort(struct audio_port_v7 *port) = 0;

		/* Create an audio patch between several source and sink ports */
		virtual status_t createAudioPatch(const struct audio_patch *patch,

services/audiopolicy/AudioPolicyInterface.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -227,9 +227,9 @@ public:
		virtual status_t listAudioPorts(audio_port_role_t role,
		audio_port_type_t type,
		unsigned int *num_ports,
		struct audio_port *ports,
		struct audio_port_v7 *ports,
		unsigned int *generation) = 0;
		virtual status_t getAudioPort(struct audio_port *port) = 0;
		virtual status_t getAudioPort(struct audio_port_v7 *port) = 0;
		virtual status_t createAudioPatch(const struct audio_patch *patch,
		audio_patch_handle_t *handle,
		uid_t uid) = 0;