Merge "aaudio: reserve some error codes" into oc-dev (76f3c913) · Commits · e / os / android_frameworks_av

media/libaaudio/include/aaudio/AAudio.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -62,14 +62,14 @@ enum {
		AAUDIO_ERROR_BASE = -900, // TODO review
		AAUDIO_ERROR_DISCONNECTED,
		AAUDIO_ERROR_ILLEGAL_ARGUMENT,
		AAUDIO_ERROR_INCOMPATIBLE,
		AAUDIO_ERROR_INTERNAL, // an underlying API returned an error code
		// reserved
		AAUDIO_ERROR_INTERNAL = AAUDIO_ERROR_ILLEGAL_ARGUMENT + 2,
		AAUDIO_ERROR_INVALID_STATE,
		AAUDIO_ERROR_UNEXPECTED_STATE,
		AAUDIO_ERROR_UNEXPECTED_VALUE,
		AAUDIO_ERROR_INVALID_HANDLE,
		AAUDIO_ERROR_INVALID_QUERY,
		AAUDIO_ERROR_UNIMPLEMENTED,
		// reserved
		// reserved
		AAUDIO_ERROR_INVALID_HANDLE = AAUDIO_ERROR_INVALID_STATE + 3,
		// reserved
		AAUDIO_ERROR_UNIMPLEMENTED = AAUDIO_ERROR_INVALID_HANDLE + 2,
		AAUDIO_ERROR_UNAVAILABLE,
		AAUDIO_ERROR_NO_FREE_HANDLES,
		AAUDIO_ERROR_NO_MEMORY,

media/libaaudio/src/client/AudioStreamInternal.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ aaudio_result_t AudioStreamInternal::processCommands() {
		default:
		ALOGE("WARNING - AudioStreamInternal::processCommands() Unrecognized what = %d",
		(int) message.what);
		result = AAUDIO_ERROR_UNEXPECTED_VALUE;
		result = AAUDIO_ERROR_INTERNAL;
		break;
		}
		}

media/libaaudio/src/core/AAudioAudio.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -51,13 +51,13 @@ AAUDIO_API const char * AAudio_convertResultToText(aaudio_result_t returnCode) {
		AAUDIO_CASE_ENUM(AAUDIO_OK);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_DISCONNECTED);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_ILLEGAL_ARGUMENT);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_INCOMPATIBLE);
		// reserved
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_INTERNAL);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_STATE);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNEXPECTED_STATE);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNEXPECTED_VALUE);
		// reserved
		// reserved
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_HANDLE);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_INVALID_QUERY);
		// reserved
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNIMPLEMENTED);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_UNAVAILABLE);
		AAUDIO_CASE_ENUM(AAUDIO_ERROR_NO_FREE_HANDLES);
		@@ -114,7 +114,7 @@ static AudioStreamBuilder *convertAAudioBuilderToStreamBuilder(AAudioStreamBuild

		AAUDIO_API aaudio_result_t AAudio_createStreamBuilder(AAudioStreamBuilder** builder)
		{
		AudioStreamBuilder *audioStreamBuilder = new AudioStreamBuilder();
		AudioStreamBuilder *audioStreamBuilder = new(std::nothrow) AudioStreamBuilder();
		if (audioStreamBuilder == nullptr) {
		return AAUDIO_ERROR_NO_MEMORY;
		}
		@@ -235,7 +235,7 @@ AAUDIO_API aaudio_result_t AAudioStreamBuilder_delete(AAudioStreamBuilder* buil
		delete streamBuilder;
		return AAUDIO_OK;
		}
		return AAUDIO_ERROR_INVALID_HANDLE;
		return AAUDIO_ERROR_NULL;
		}

		AAUDIO_API aaudio_result_t AAudioStream_close(AAudioStream* stream)
		@@ -247,7 +247,7 @@ AAUDIO_API aaudio_result_t AAudioStream_close(AAudioStream* stream)
		delete audioStream;
		return AAUDIO_OK;
		}
		return AAUDIO_ERROR_INVALID_HANDLE;
		return AAUDIO_ERROR_NULL;
		}

		AAUDIO_API aaudio_result_t AAudioStream_requestStart(AAudioStream* stream)

media/libaaudio/src/core/AudioStream.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ aaudio_result_t AudioStream::open(const AudioStreamBuilder& builder)
		break;
		default:
		ALOGE("AudioStream::open(): illegal performanceMode %d", mPerformanceMode);
		return AAUDIO_ERROR_UNEXPECTED_VALUE;
		return AAUDIO_ERROR_ILLEGAL_ARGUMENT;
		}

		return AAUDIO_OK;

media/libaaudio/src/legacy/AudioStreamLegacy.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ aaudio_result_t AudioStreamLegacy::getBestTimestamp(clockid_t clockId,
		break;
		default:
		ALOGE("getTimestamp() - Unrecognized clock type %d", (int) clockId);
		return AAUDIO_ERROR_UNEXPECTED_VALUE;
		return AAUDIO_ERROR_ILLEGAL_ARGUMENT;
		break;
		}
		status_t status = extendedTimestamp->getBestTimestamp(framePosition, timeNanoseconds, timebase);