Merge "TimeCheck: Disable on audio datapath calls" (8baf6178) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/EffectHalHidl.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,13 +93,13 @@ status_t EffectHalHidl::setOutBuffer(const sp<EffectBufferHalInterface>& buffer)
	}		}

	status_t EffectHalHidl::process() {		status_t EffectHalHidl::process() {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.

	return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS));		return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS));
	}		}

	status_t EffectHalHidl::processReverse() {		status_t EffectHalHidl::processReverse() {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.

	return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE));		return processImpl(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE));
	}		}

media/libaudiohal/impl/StreamHalHidl.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,7 @@ status_t StreamOutHalHidl::selectPresentation(int presentationId, int programId)
	#endif		#endif

	status_t StreamOutHalHidl::write(const void buffer, size_t bytes, size_t written) {		status_t StreamOutHalHidl::write(const void buffer, size_t bytes, size_t written) {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.
	if (mStream == 0) return NO_INIT;		if (mStream == 0) return NO_INIT;
	*written = 0;		*written = 0;

	@@ -587,7 +587,7 @@ status_t StreamOutHalHidl::prepareForWriting(size_t bufferSize) {
	}		}

	status_t StreamOutHalHidl::getRenderPosition(uint32_t *dspFrames) {		status_t StreamOutHalHidl::getRenderPosition(uint32_t *dspFrames) {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.
	if (mStream == 0) return NO_INIT;		if (mStream == 0) return NO_INIT;
	Result retval;		Result retval;
	Return<void> ret = mStream->getRenderPosition(		Return<void> ret = mStream->getRenderPosition(
	@@ -668,7 +668,7 @@ status_t StreamOutHalHidl::flush() {
	}		}

	status_t StreamOutHalHidl::getPresentationPosition(uint64_t frames, struct timespec timestamp) {		status_t StreamOutHalHidl::getPresentationPosition(uint64_t frames, struct timespec timestamp) {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.
	if (mStream == 0) return NO_INIT;		if (mStream == 0) return NO_INIT;
	if (mWriterClient == gettid() && mCommandMQ) {		if (mWriterClient == gettid() && mCommandMQ) {
	return callWriterThread(		return callWriterThread(
	@@ -1012,7 +1012,7 @@ status_t StreamInHalHidl::setGain(float gain) {
	}		}

	status_t StreamInHalHidl::read(void buffer, size_t bytes, size_t read) {		status_t StreamInHalHidl::read(void buffer, size_t bytes, size_t read) {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.
	if (mStream == 0) return NO_INIT;		if (mStream == 0) return NO_INIT;
	*read = 0;		*read = 0;

	@@ -1146,7 +1146,7 @@ status_t StreamInHalHidl::getInputFramesLost(uint32_t *framesLost) {
	}		}

	status_t StreamInHalHidl::getCapturePosition(int64_t frames, int64_t time) {		status_t StreamInHalHidl::getCapturePosition(int64_t frames, int64_t time) {
	TIME_CHECK();		// TIME_CHECK(); // TODO(b/238654698) reenable only when optimized.
	if (mStream == 0) return NO_INIT;		if (mStream == 0) return NO_INIT;
	if (mReaderClient == gettid() && mCommandMQ) {		if (mReaderClient == gettid() && mCommandMQ) {
	ReadParameters params;		ReadParameters params;