Merge "aaudio: reduce log spam" (7f7dc877) · Commits · e / os / android_frameworks_av

media/libaaudio/src/binding/IAAudioService.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ public:
		ALOGE("BpAAudioService::client transact(OPEN_STREAM) readInt %d", err);
		return AAudioConvert_androidToAAudioResult(err);
		} else if (stream < 0) {
		ALOGE("BpAAudioService::client OPEN_STREAM passed stream %d", stream);
		return stream;
		}
		err = configurationOutput.readFromParcel(&reply);

media/libaaudio/src/client/AudioStreamInternal.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) {
		mServiceStreamHandle = mServiceInterface.openStream(request, configurationOutput);
		}
		if (mServiceStreamHandle < 0) {
		ALOGE("%s - openStream() returned %d", __func__, mServiceStreamHandle);
		return mServiceStreamHandle;
		}

		@@ -693,7 +692,6 @@ aaudio_result_t AudioStreamInternal::setBufferSize(int32_t requestedFrames) {
		}

		aaudio_result_t result = mAudioEndpoint.setBufferSizeInFrames(adjustedFrames, &actualFrames);
		ALOGD("setBufferSize() req = %d => %d", requestedFrames, actualFrames);
		if (result < 0) {
		return result;
		} else {

media/libaaudio/src/core/AAudioAudio.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ AAUDIO_API aaudio_result_t AAudioStreamBuilder_openStream(AAudioStreamBuilder*
		{
		AudioStream *audioStream = nullptr;
		// Please leave these logs because they are very helpful when debugging.
		ALOGD("AAudioStreamBuilder_openStream() called ----------------------------------------");
		ALOGD("%s() called ----------------------------------------", __func__);
		AudioStreamBuilder *streamBuilder = COMMON_GET_FROM_BUILDER_OR_RETURN(streamPtr);
		aaudio_result_t result = streamBuilder->build(&audioStream);
		ALOGD("AAudioStreamBuilder_openStream() returns %d = %s for (%p) ----------------",
		@@ -269,7 +269,7 @@ AAUDIO_API aaudio_result_t AAudioStream_close(AAudioStream* stream)
		{
		aaudio_result_t result = AAUDIO_ERROR_NULL;
		AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);
		ALOGD("AAudioStream_close(%p) called ---------------", stream);
		ALOGD("%s(%p) called ---------------", __func__, stream);
		if (audioStream != nullptr) {
		result = audioStream->safeClose();
		// Close will only fail if called illegally, for example, from a callback.
		@@ -284,7 +284,7 @@ AAUDIO_API aaudio_result_t AAudioStream_close(AAudioStream* stream)
		// We're potentially freeing `stream` above, so its use here makes some
		// static analysis tools unhappy. Casting to uintptr_t helps assure
		// said tools that we're not doing anything bad here.
		ALOGD("AAudioStream_close(%#" PRIxPTR ") returned %d ---------",
		ALOGD("%s(%#" PRIxPTR ") returned %d ---------", __func__,
		reinterpret_cast<uintptr_t>(stream), result);
		return result;
		}
		@@ -292,30 +292,30 @@ AAUDIO_API aaudio_result_t AAudioStream_close(AAudioStream* stream)
		AAUDIO_API aaudio_result_t AAudioStream_requestStart(AAudioStream* stream)
		{
		AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);
		ALOGD("AAudioStream_requestStart(%p) called --------------", stream);
		ALOGD("%s(%p) called --------------", __func__, stream);
		aaudio_result_t result = audioStream->systemStart();
		ALOGD("AAudioStream_requestStart(%p) returned %d ---------", stream, result);
		ALOGD("%s(%p) returned %d ---------", __func__, stream, result);
		return result;
		}

		AAUDIO_API aaudio_result_t AAudioStream_requestPause(AAudioStream* stream)
		{
		AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);
		ALOGD("AAudioStream_requestPause(%p)", stream);
		ALOGD("%s(%p) called", __func__, stream);
		return audioStream->systemPause();
		}

		AAUDIO_API aaudio_result_t AAudioStream_requestFlush(AAudioStream* stream)
		{
		AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);
		ALOGD("AAudioStream_requestFlush(%p)", stream);
		ALOGD("%s(%p) called", __func__, stream);
		return audioStream->safeFlush();
		}

		AAUDIO_API aaudio_result_t AAudioStream_requestStop(AAudioStream* stream)
		{
		AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);
		ALOGD("AAudioStream_requestStop(%p)", stream);
		ALOGD("%s(%p) called", __func__, stream);
		return audioStream->systemStop();
		}

media/libaaudio/src/core/AudioStream.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ AudioStream::AudioStream()
		}

		AudioStream::~AudioStream() {
		ALOGD("destroying %p, state = %s", this, AAudio_convertStreamStateToText(getState()));
		// If the stream is deleted when OPEN or in use then audio resources will leak.
		// This would indicate an internal error. So we want to find this ASAP.
		LOG_ALWAYS_FATAL_IF(!(getState() == AAUDIO_STREAM_STATE_CLOSED

services/oboeservice/AAudioEndpointManager.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ sp<AAudioServiceEndpoint> AAudioEndpointManager::openExclusiveEndpoint(

		aaudio_result_t result = endpoint->open(request);
		if (result != AAUDIO_OK) {
		ALOGE("openExclusiveEndpoint(), open failed");
		ALOGV("openExclusiveEndpoint(), open failed");
		endpoint.clear();
		} else {
		mExclusiveStreams.push_back(endpointMMap);