Merge "Add audio_input_flags_t to IAudioFlinger::openInput" into lmp-dev (d1a4f35e) · Commits · e / os / android_frameworks_av

include/media/IAudioFlinger.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,8 @@ public:
		audio_devices_t *pDevices,
		uint32_t *pSamplingRate,
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask) = 0;
		audio_channel_mask_t *pChannelMask,
		audio_input_flags_t flags) = 0;
		virtual status_t closeInput(audio_io_handle_t input) = 0;

		virtual status_t invalidateStream(audio_stream_type_t stream) = 0;

+6 −2

Original line number	Diff line number	Diff line
		@@ -532,7 +532,8 @@ public:
		audio_devices_t *pDevices,
		uint32_t *pSamplingRate,
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask)
		audio_channel_mask_t *pChannelMask,
		audio_input_flags_t flags)
		{
		Parcel data, reply;
		audio_devices_t devices = pDevices != NULL ? *pDevices : AUDIO_DEVICE_NONE;
		@@ -547,6 +548,7 @@ public:
		data.writeInt32(samplingRate);
		data.writeInt32(format);
		data.writeInt32(channelMask);
		data.writeInt32(flags);
		remote()->transact(OPEN_INPUT, data, &reply);
		audio_io_handle_t input = (audio_io_handle_t) reply.readInt32();
		devices = (audio_devices_t)reply.readInt32();
		@@ -1157,12 +1159,14 @@ status_t BnAudioFlinger::onTransact(
		uint32_t samplingRate = data.readInt32();
		audio_format_t format = (audio_format_t) data.readInt32();
		audio_channel_mask_t channelMask = (audio_channel_mask_t)data.readInt32();
		audio_input_flags_t flags = (audio_input_flags_t) data.readInt32();

		audio_io_handle_t input = openInput(module,
		&devices,
		&samplingRate,
		&format,
		&channelMask);
		&channelMask,
		flags);
		reply->writeInt32((int32_t) input);
		reply->writeInt32(devices);
		reply->writeInt32(samplingRate);

+4 −3

Original line number	Diff line number	Diff line
		@@ -1820,7 +1820,8 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module,
		audio_devices_t *pDevices,
		uint32_t *pSamplingRate,
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask)
		audio_channel_mask_t *pChannelMask,
		audio_input_flags_t flags)
		{
		struct audio_config config;
		memset(&config, 0, sizeof(config));
		@@ -1847,15 +1848,15 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module,
		audio_io_handle_t id = nextUniqueId();

		audio_stream_in_t *inStream = NULL;
		audio_input_flags_t flags = AUDIO_INPUT_FLAG_FAST; // FIXME until added to openInput()
		status_t status = inHwHal->open_input_stream(inHwHal, id, *pDevices, &config,
		&inStream, flags);
		ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %#x, Channels %x, "
		"status %d",
		"flags %#x, status %d",
		inStream,
		config.sample_rate,
		config.format,
		config.channel_mask,
		flags,
		status);

		// If the input could not be opened with the requested parameters and we can handle the

+2 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,8 @@ public:
		audio_devices_t *pDevices,
		uint32_t *pSamplingRate,
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask);
		audio_channel_mask_t *pChannelMask,
		audio_input_flags_t flags);

		virtual status_t closeInput(audio_io_handle_t input);

+3 −2

Original line number	Diff line number	Diff line
		@@ -101,7 +101,8 @@ audio_io_handle_t AudioPolicyService::AudioPolicyClient::openInput(audio_module_
		audio_devices_t *pDevices,
		uint32_t *pSamplingRate,
		audio_format_t *pFormat,
		audio_channel_mask_t *pChannelMask)
		audio_channel_mask_t *pChannelMask,
		audio_input_flags_t flags)
		{
		sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
		if (af == 0) {
		@@ -109,7 +110,7 @@ audio_io_handle_t AudioPolicyService::AudioPolicyClient::openInput(audio_module_
		return 0;
		}

		return af->openInput(module, pDevices, pSamplingRate, pFormat, pChannelMask);
		return af->openInput(module, pDevices, pSamplingRate, pFormat, pChannelMask, flags);
		}

		status_t AudioPolicyService::AudioPolicyClient::closeInput(audio_io_handle_t input)