Merge changes I64f56526,I65c5c7ba (f6b8df28) · Commits · e / os / android_hardware_interfaces

audio/2.0/IStream.hal

+52 −0

Original line number	Diff line number	Diff line
		@@ -227,4 +227,56 @@ interface IStream {
		* @param fd dump file descriptor.
		*/
		debugDump(handle fd);

		/*
		* Called by the framework to start a stream operating in mmap mode.
		* createMmapBuffer() must be called before calling start().
		* Function only implemented by streams operating in mmap mode.
		*
		* @return retval OK in case the success.
		* NOT_SUPPORTED on non mmap mode streams
		* INVALID_STATE if called out of sequence
		*/
		start() generates (Result retval);

		/**
		* Called by the framework to stop a stream operating in mmap mode.
		* Function only implemented by streams operating in mmap mode.
		*
		* @return retval OK in case the succes.
		* NOT_SUPPORTED on non mmap mode streams
		* INVALID_STATE if called out of sequence
		*/
		stop() generates (Result retval) ;

		/*
		* Called by the framework to retrieve information on the mmap buffer used for audio
		* samples transfer.
		* Function only implemented by streams operating in mmap mode.
		*
		* @param minSizeFrames minimum buffer size requested. The actual buffer
		* size returned in struct MmapBufferInfo can be larger.
		* @return retval OK in case the success.
		* NOT_SUPPORTED on non mmap mode streams
		* NOT_INITIALIZED in case of memory allocation error
		* INVALID_ARGUMENTS if the requested buffer size is too large
		* INVALID_STATE if called out of sequence
		* @return info a MmapBufferInfo struct containing information on the MMMAP buffer created.
		*/
		createMmapBuffer(int32_t minSizeFrames)
		generates (Result retval, MmapBufferInfo info);

		/*
		* Called by the framework to read current read/write position in the mmap buffer
		* with associated time stamp.
		* Function only implemented by streams operating in mmap mode.
		*
		* @return retval OK in case the success.
		* NOT_SUPPORTED on non mmap mode streams
		* INVALID_STATE if called out of sequence
		* @return position a MmapPosition struct containing current HW read/write position in frames
		* with associated time stamp.
		*/
		getMmapPosition()
		generates (Result retval, MmapPosition position);
		};

audio/2.0/default/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ LOCAL_SHARED_LIBRARIES := \
		libhidlbase \
		libhidltransport \
		libhwbinder \
		libcutils \
		libutils \
		libhardware \
		liblog \

audio/2.0/default/Stream.cpp

+25 −1

Original line number	Diff line number	Diff line
		@@ -43,9 +43,10 @@ Stream::~Stream() {
		mStream = nullptr;
		}

		// static
		Result Stream::analyzeStatus(const char* funcName, int status, int ignoreError) {
		if (status != 0 && status != -ignoreError) {
		ALOGW("Stream %p %s: %s", mStream, funcName, strerror(-status));
		ALOGW("Error from HAL stream in function %s: %s", funcName, strerror(-status));
		}
		switch (status) {
		case 0: return Result::OK;
		@@ -229,6 +230,29 @@ Return<void> Stream::debugDump(const hidl_handle& fd) {
		return Void();
		}

		Return<Result> Stream::start() {
		return Result::NOT_SUPPORTED;
		}

		Return<Result> Stream::stop() {
		return Result::NOT_SUPPORTED;
		}

		Return<void> Stream::createMmapBuffer(int32_t minSizeFrames __unused,
		createMmapBuffer_cb _hidl_cb) {
		Result retval(Result::NOT_SUPPORTED);
		MmapBufferInfo info;
		_hidl_cb(retval, info);
		return Void();
		}

		Return<void> Stream::getMmapPosition(getMmapPosition_cb _hidl_cb) {
		Result retval(Result::NOT_SUPPORTED);
		MmapPosition position;
		_hidl_cb(retval, position);
		return Void();
		}

		} // namespace implementation
		} // namespace V2_0
		} // namespace audio

audio/2.0/default/Stream.h

+80 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#define ANDROID_HARDWARE_AUDIO_V2_0_STREAM_H

		#include <android/hardware/audio/2.0/IStream.h>
		#include <hardware/audio.h>
		#include <hidl/Status.h>

		#include <hidl/MQDescriptor.h>
		@@ -71,9 +72,13 @@ struct Stream : public IStream, public ParametersUtil {
		const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb) override;
		Return<Result> setParameters(const hidl_vec<ParameterValue>& parameters) override;
		Return<void> debugDump(const hidl_handle& fd) override;
		Return<Result> start() override;
		Return<Result> stop() override;
		Return<void> createMmapBuffer(int32_t minSizeFrames, createMmapBuffer_cb _hidl_cb) override;
		Return<void> getMmapPosition(getMmapPosition_cb _hidl_cb) override;

		// Utility methods for extending interfaces.
		Result analyzeStatus(const char* funcName, int status, int ignoreError = OK);
		static Result analyzeStatus(const char* funcName, int status, int ignoreError = OK);

		private:
		audio_stream_t *mStream;
		@@ -85,6 +90,80 @@ struct Stream : public IStream, public ParametersUtil {
		int halSetParameters(const char* keysAndValues) override;
		};


		template <typename T>
		struct StreamMmap : public RefBase {
		explicit StreamMmap(T* stream) : mStream(stream) {}

		Return<Result> start();
		Return<Result> stop();
		Return<void> createMmapBuffer(
		int32_t minSizeFrames, size_t frameSize, IStream::createMmapBuffer_cb _hidl_cb);
		Return<void> getMmapPosition(IStream::getMmapPosition_cb _hidl_cb);

		private:
		StreamMmap() {}

		T *mStream;
		};

		template <typename T>
		Return<Result> StreamMmap<T>::start() {
		if (mStream->start == NULL) return Result::NOT_SUPPORTED;
		int result = mStream->start(mStream);
		return Stream::analyzeStatus("start", result);
		}

		template <typename T>
		Return<Result> StreamMmap<T>::stop() {
		if (mStream->stop == NULL) return Result::NOT_SUPPORTED;
		int result = mStream->stop(mStream);
		return Stream::analyzeStatus("stop", result);
		}

		template <typename T>
		Return<void> StreamMmap<T>::createMmapBuffer(int32_t minSizeFrames, size_t frameSize,
		IStream::createMmapBuffer_cb _hidl_cb) {
		Result retval(Result::NOT_SUPPORTED);
		MmapBufferInfo info;

		if (mStream->create_mmap_buffer != NULL) {
		struct audio_mmap_buffer_info halInfo;
		retval = Stream::analyzeStatus(
		"create_mmap_buffer",
		mStream->create_mmap_buffer(mStream, minSizeFrames, &halInfo));
		if (retval == Result::OK) {
		native_handle_t* hidlHandle = native_handle_create(1, 0);
		hidlHandle->data[0] = halInfo.shared_memory_fd;
		info.sharedMemory = hidl_memory("audio_buffer", hidlHandle,
		frameSize *halInfo.buffer_size_frames);
		info.bufferSizeFrames = halInfo.buffer_size_frames;
		info.burstSizeFrames = halInfo.burst_size_frames;
		}
		}
		_hidl_cb(retval, info);
		return Void();
		}

		template <typename T>
		Return<void> StreamMmap<T>::getMmapPosition(IStream::getMmapPosition_cb _hidl_cb) {
		Result retval(Result::NOT_SUPPORTED);
		MmapPosition position;

		if (mStream->get_mmap_position != NULL) {
		struct audio_mmap_position halPosition;
		retval = Stream::analyzeStatus(
		"get_mmap_position",
		mStream->get_mmap_position(mStream, &halPosition));
		if (retval == Result::OK) {
		position.timeNanoseconds = halPosition.time_nanoseconds;
		position.positionFrames = halPosition.position_frames;
		}
		}
		_hidl_cb(retval, position);
		return Void();
		}

		} // namespace implementation
		} // namespace V2_0
		} // namespace audio

audio/2.0/default/StreamIn.cpp

+22 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,9 @@ namespace V2_0 {
		namespace implementation {

		StreamIn::StreamIn(audio_hw_device_t* device, audio_stream_in_t* stream)
		: mDevice(device), mStream(stream), mStreamCommon(new Stream(&stream->common)) {
		: mDevice(device), mStream(stream),
		mStreamCommon(new Stream(&stream->common)),
		mStreamMmap(new StreamMmap<audio_stream_in_t>(stream)) {
		}

		StreamIn::~StreamIn() {
		@@ -130,6 +132,22 @@ Return<void> StreamIn::debugDump(const hidl_handle& fd) {
		return mStreamCommon->debugDump(fd);
		}

		Return<Result> StreamIn::start() {
		return mStreamMmap->start();
		}

		Return<Result> StreamIn::stop() {
		return mStreamMmap->stop();
		}

		Return<void> StreamIn::createMmapBuffer(int32_t minSizeFrames, createMmapBuffer_cb _hidl_cb) {
		return mStreamMmap->createMmapBuffer(
		minSizeFrames, audio_stream_in_frame_size(mStream), _hidl_cb);
		}

		Return<void> StreamIn::getMmapPosition(getMmapPosition_cb _hidl_cb) {
		return mStreamMmap->getMmapPosition(_hidl_cb);
		}

		// Methods from ::android::hardware::audio::V2_0::IStreamIn follow.
		Return<void> StreamIn::getAudioSource(getAudioSource_cb _hidl_cb) {
		@@ -144,7 +162,7 @@ Return<void> StreamIn::getAudioSource(getAudioSource_cb _hidl_cb) {
		}

		Return<Result> StreamIn::setGain(float gain) {
		return mStreamCommon->analyzeStatus("set_gain", mStream->set_gain(mStream, gain));
		return Stream::analyzeStatus("set_gain", mStream->set_gain(mStream, gain));
		}

		Return<void> StreamIn::read(uint64_t size, read_cb _hidl_cb) {
		@@ -157,7 +175,7 @@ Return<void> StreamIn::read(uint64_t size, read_cb _hidl_cb) {
		data.resize(readResult);
		} else if (readResult < 0) {
		data.resize(0);
		retval = mStreamCommon->analyzeStatus("read", readResult);
		retval = Stream::analyzeStatus("read", readResult);
		}
		_hidl_cb(retval, data);
		return Void();
		@@ -172,7 +190,7 @@ Return<void> StreamIn::getCapturePosition(getCapturePosition_cb _hidl_cb) {
		uint64_t frames = 0, time = 0;
		if (mStream->get_capture_position != NULL) {
		int64_t halFrames, halTime;
		retval = mStreamCommon->analyzeStatus(
		retval = Stream::analyzeStatus(
		"get_capture_position",
		mStream->get_capture_position(mStream, &halFrames, &halTime));
		if (retval == Result::OK) {