Merge "Support query microphones information." into pi-dev (28eecdd3) · Commits · e / os / android_frameworks_av

media/libaudioclient/IAudioFlinger.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ enum {
		GET_AUDIO_HW_SYNC_FOR_SESSION,
		SYSTEM_READY,
		FRAME_COUNT_HAL,
		LIST_MICROPHONES,
		GET_MICROPHONES,
		};

		#define MAX_ITEMS_PER_LIST 1024
		@@ -849,7 +849,7 @@ public:
		{
		Parcel data, reply;
		data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
		status_t status = remote()->transact(LIST_MICROPHONES, data, &reply);
		status_t status = remote()->transact(GET_MICROPHONES, data, &reply);
		if (status != NO_ERROR \|\|
		(status = (status_t)reply.readInt32()) != NO_ERROR) {
		return status;
		@@ -1444,7 +1444,7 @@ status_t BnAudioFlinger::onTransact(
		reply->writeInt64( frameCountHAL((audio_io_handle_t) data.readInt32()) );
		return NO_ERROR;
		} break;
		case LIST_MICROPHONES: {
		case GET_MICROPHONES: {
		CHECK_INTERFACE(IAudioFlinger, data, reply);
		std::vector<media::MicrophoneInfo> microphones;
		status_t status = getMicrophones(&microphones);

+6 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,12 @@ status_t DeviceHalHidl::setAudioPortConfig(const struct audio_port_config *confi
		return processReturn("setAudioPortConfig", mDevice->setAudioPortConfig(hidlConfig));
		}

		status_t DeviceHalHidl::getMicrophones(
		std::vector<media::MicrophoneInfo> *microphonesInfo __unused) {
		if (mDevice == 0) return NO_INIT;
		return INVALID_OPERATION;
		}

		status_t DeviceHalHidl::dump(int fd) {
		if (mDevice == 0) return NO_INIT;
		native_handle_t* hidlHandle = native_handle_create(1, 0);

+3 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,9 @@ class DeviceHalHidl : public DeviceHalInterface, public ConversionHelperHidl
		// Set audio port configuration.
		virtual status_t setAudioPortConfig(const struct audio_port_config *config);

		// List microphones
		virtual status_t getMicrophones(std::vector<media::MicrophoneInfo> *microphones);

		virtual status_t dump(int fd);

		private:

+5 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,11 @@ status_t DeviceHalLocal::setAudioPortConfig(const struct audio_port_config *conf
		return INVALID_OPERATION;
		}

		status_t DeviceHalLocal::getMicrophones(
		std::vector<media::MicrophoneInfo> *microphones __unused) {
		return INVALID_OPERATION;
		}

		status_t DeviceHalLocal::dump(int fd) {
		return mDev->dump(mDev, fd);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,9 @@ class DeviceHalLocal : public DeviceHalInterface
		// Set audio port configuration.
		virtual status_t setAudioPortConfig(const struct audio_port_config *config);

		// List microphones
		virtual status_t getMicrophones(std::vector<media::MicrophoneInfo> *microphones);

		virtual status_t dump(int fd);

		void closeOutputStream(struct audio_stream_out *stream_out);