Merge "Remove acoustics from AudioSystem::getInput()" (9ee836fc) · Commits · e / os / android_frameworks_av

include/media/AudioSystem.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ public:
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = AUDIO_CHANNEL_IN_MONO,
		audio_in_acoustics_t acoustics = (audio_in_acoustics_t)0,
		int sessionId = 0);
		static status_t startInput(audio_io_handle_t input);
		static status_t stopInput(audio_io_handle_t input);

+0 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ public:
		uint32_t samplingRate = 0,
		audio_format_t format = AUDIO_FORMAT_DEFAULT,
		uint32_t channels = 0,
		audio_in_acoustics_t acoustics = (audio_in_acoustics_t)0,
		int audioSession = 0) = 0;
		virtual status_t startInput(audio_io_handle_t input) = 0;
		virtual status_t stopInput(audio_io_handle_t input) = 0;

+0 −2

Original line number	Diff line number	Diff line
		@@ -162,7 +162,6 @@ status_t AudioRecord::set(
		sampleRate,
		format,
		channelMask,
		(audio_in_acoustics_t) 0,
		mSessionId);
		if (input == 0) {
		ALOGE("Could not get audio input for record source %d", inputSource);
		@@ -600,7 +599,6 @@ audio_io_handle_t AudioRecord::getInput_l()
		mCblk->sampleRate,
		mFormat,
		mChannelMask,
		(audio_in_acoustics_t) 0,
		mSessionId);
		return mInput;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -625,12 +625,11 @@ audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource,
		uint32_t samplingRate,
		audio_format_t format,
		uint32_t channels,
		audio_in_acoustics_t acoustics,
		int sessionId)
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return 0;
		return aps->getInput(inputSource, samplingRate, format, channels, acoustics, sessionId);
		return aps->getInput(inputSource, samplingRate, format, channels, sessionId);
		}

		status_t AudioSystem::startInput(audio_io_handle_t input)

+0 −5

Original line number	Diff line number	Diff line
		@@ -176,7 +176,6 @@ public:
		uint32_t samplingRate,
		audio_format_t format,
		uint32_t channels,
		audio_in_acoustics_t acoustics,
		int audioSession)
		{
		Parcel data, reply;
		@@ -185,7 +184,6 @@ public:
		data.writeInt32(samplingRate);
		data.writeInt32(static_cast <uint32_t>(format));
		data.writeInt32(channels);
		data.writeInt32(static_cast <uint32_t>(acoustics));
		data.writeInt32(audioSession);
		remote()->transact(GET_INPUT, data, &reply);
		return static_cast <audio_io_handle_t> (reply.readInt32());
		@@ -465,14 +463,11 @@ status_t BnAudioPolicyService::onTransact(
		uint32_t samplingRate = data.readInt32();
		audio_format_t format = (audio_format_t) data.readInt32();
		uint32_t channels = data.readInt32();
		audio_in_acoustics_t acoustics =
		static_cast <audio_in_acoustics_t>(data.readInt32());
		int audioSession = data.readInt32();
		audio_io_handle_t input = getInput(inputSource,
		samplingRate,
		format,
		channels,
		acoustics,
		audioSession);
		reply->writeInt32(static_cast <int>(input));
		return NO_ERROR;