Merge "libaudiohal: When starting write, consider the stream buffer size" into oc-mr1-dev (8b852805) · Commits · e / os / android_frameworks_av

media/libaudiohal/StreamHalHidl.cpp

+28 −4

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@ namespace android {
		StreamHalHidl::StreamHalHidl(IStream *stream)
		: ConversionHelperHidl("Stream"),
		mStream(stream),
		mHalThreadPriority(HAL_THREAD_PRIORITY_DEFAULT) {
		mHalThreadPriority(HAL_THREAD_PRIORITY_DEFAULT),
		mCachedBufferSize(0){

		// Instrument audio signal power logging.
		// Note: This assumes channel mask, format, and sample rate do not change after creation.
		@@ -73,7 +74,11 @@ status_t StreamHalHidl::getSampleRate(uint32_t *rate) {

		status_t StreamHalHidl::getBufferSize(size_t *size) {
		if (!mStream) return NO_INIT;
		return processReturn("getBufferSize", mStream->getBufferSize(), size);
		status_t status = processReturn("getBufferSize", mStream->getBufferSize(), size);
		if (status == OK) {
		mCachedBufferSize = *size;
		}
		return status;
		}

		status_t StreamHalHidl::getChannelMask(audio_channel_mask_t *mask) {
		@@ -202,6 +207,14 @@ status_t StreamHalHidl::setHalThreadPriority(int priority) {
		return OK;
		}

		status_t StreamHalHidl::getCachedBufferSize(size_t *size) {
		if (mCachedBufferSize != 0) {
		*size = mCachedBufferSize;
		return OK;
		}
		return getBufferSize(size);
		}

		bool StreamHalHidl::requestHalThreadPriority(pid_t threadPid, pid_t threadId) {
		if (mHalThreadPriority == HAL_THREAD_PRIORITY_DEFAULT) {
		return true;
		@@ -320,9 +333,20 @@ status_t StreamOutHalHidl::write(const void buffer, size_t bytes, size_t writt
		}

		status_t status;
		if (!mDataMQ && (status = prepareForWriting(bytes)) != OK) {
		if (!mDataMQ) {
		// In case if playback starts close to the end of a compressed track, the bytes
		// that need to be written is less than the actual buffer size. Need to use
		// full buffer size for the MQ since otherwise after seeking back to the middle
		// data will be truncated.
		size_t bufferSize;
		if ((status = getCachedBufferSize(&bufferSize)) != OK) {
		return status;
		}
		if (bytes > bufferSize) bufferSize = bytes;
		if ((status = prepareForWriting(bufferSize)) != OK) {
		return status;
		}
		}

		status = callWriterThread(
		WriteCommand::WRITE, "write", static_cast<const uint8_t*>(buffer), bytes,

media/libaudiohal/StreamHalHidl.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@ class StreamHalHidl : public virtual StreamHalInterface, public ConversionHelper
		// The destructor automatically closes the stream.
		virtual ~StreamHalHidl();

		status_t getCachedBufferSize(size_t *size);

		bool requestHalThreadPriority(pid_t threadPid, pid_t threadId);

		// mStreamPowerLog is used for audio signal power logging.
		@@ -111,6 +113,7 @@ class StreamHalHidl : public virtual StreamHalInterface, public ConversionHelper
		const int HAL_THREAD_PRIORITY_DEFAULT = -1;
		IStream *mStream;
		int mHalThreadPriority;
		size_t mCachedBufferSize;
		};

		class StreamOutHalHidl : public StreamOutHalInterface, public StreamHalHidl {