Merge "Add unique audio port IDs to AudioTrack and AudioRecord" (6a308b02) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -650,6 +650,8 @@ private:
		// a value of AUDIO_PORT_HANDLE_NONE indicated default (AudioPolicyManager) routing.
		audio_port_handle_t mSelectedDeviceId;
		sp<AudioSystem::AudioDeviceCallback> mDeviceCallback;
		audio_port_handle_t mPortId; // unique ID allocated by audio policy

		};

		}; // namespace android

+7 −10

Original line number	Diff line number	Diff line
		@@ -217,12 +217,10 @@ public:
		audio_session_t session,
		audio_stream_type_t *stream,
		uid_t uid,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		audio_channel_mask_t channelMask = AUDIO_CHANNEL_OUT_STEREO,
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE,
		const audio_offload_info_t *offloadInfo = NULL);
		const audio_config_t *config,
		audio_output_flags_t flags,
		audio_port_handle_t selectedDeviceId,
		audio_port_handle_t *portId);
		static status_t startOutput(audio_io_handle_t output,
		audio_stream_type_t stream,
		audio_session_t session);
		@@ -240,11 +238,10 @@ public:
		audio_session_t session,
		pid_t pid,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,
		const audio_config_base_t *config,
		audio_input_flags_t flags,
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE);
		audio_port_handle_t selectedDeviceId,
		audio_port_handle_t *portId);

		static status_t startInput(audio_io_handle_t input,
		audio_session_t session);

+1 −0

Original line number	Diff line number	Diff line
		@@ -1134,6 +1134,7 @@ private:
		pid_t mClientPid;

		sp<AudioSystem::AudioDeviceCallback> mDeviceCallback;
		audio_port_handle_t mPortId; // unique ID allocated by audio policy
		};

		}; // namespace android

+4 −2

Original line number	Diff line number	Diff line
		@@ -66,7 +66,8 @@ public:
		pid_t tid, // -1 means unused, otherwise must be valid non-0
		audio_session_t *sessionId,
		int clientUid,
		status_t *status) = 0;
		status_t *status,
		audio_port_handle_t portId) = 0;

		virtual sp<IAudioRecord> openRecord(
		// On successful return, AudioFlinger takes over the handle
		@@ -86,7 +87,8 @@ public:
		size_t *notificationFrames,
		sp<IMemory>& cblk,
		sp<IMemory>& buffers, // return value 0 means it follows cblk
		status_t *status) = 0;
		status_t *status,
		audio_port_handle_t portId) = 0;

		// FIXME Surprisingly, format/latency don't work for input handles

+7 −10

Original line number	Diff line number	Diff line
		@@ -63,12 +63,10 @@ public:
		audio_session_t session,
		audio_stream_type_t *stream,
		uid_t uid,
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		audio_channel_mask_t channelMask = 0,
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE,
		const audio_offload_info_t *offloadInfo = NULL) = 0;
		const audio_config_t *config,
		audio_output_flags_t flags,
		audio_port_handle_t selectedDeviceId,
		audio_port_handle_t *portId) = 0;
		virtual status_t startOutput(audio_io_handle_t output,
		audio_stream_type_t stream,
		audio_session_t session) = 0;
		@@ -83,11 +81,10 @@ public:
		audio_session_t session,
		pid_t pid,
		uid_t uid,
		uint32_t samplingRate,
		audio_format_t format,
		audio_channel_mask_t channelMask,
		const audio_config_base_t *config,
		audio_input_flags_t flags,
		audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE) = 0;
		audio_port_handle_t selectedDeviceId,
		audio_port_handle_t *portId) = 0;
		virtual status_t startInput(audio_io_handle_t input,
		audio_session_t session) = 0;
		virtual status_t stopInput(audio_io_handle_t input,