Fix type of AudioTrack/AudioRecord parameter notificationFrames (838b3d8b) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ public:
		int frameCount = 0,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		uint32_t notificationFrames = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE);
		@@ -194,7 +194,7 @@ public:
		int frameCount = 0,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		uint32_t notificationFrames = 0,
		bool threadCanCallJava = false,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,

+3 −3

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ public:
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		uint32_t notificationFrames = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		const audio_offload_info_t *offloadInfo = NULL,
		@@ -212,7 +212,7 @@ public:
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		uint32_t notificationFrames = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		const audio_offload_info_t *offloadInfo = NULL,
		@@ -249,7 +249,7 @@ public:
		audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE,
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		uint32_t notificationFrames = 0,
		const sp<IMemory>& sharedBuffer = 0,
		bool threadCanCallJava = false,
		int sessionId = AUDIO_SESSION_ALLOCATE,

+4 −4

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ AudioRecord::AudioRecord(
		int frameCount,
		callback_t cbf,
		void* user,
		int notificationFrames,
		uint32_t notificationFrames,
		int sessionId,
		transfer_type transferType,
		audio_input_flags_t flags __unused)
		@@ -117,14 +117,14 @@ status_t AudioRecord::set(
		int frameCountInt,
		callback_t cbf,
		void* user,
		int notificationFrames,
		uint32_t notificationFrames,
		bool threadCanCallJava,
		int sessionId,
		transfer_type transferType,
		audio_input_flags_t flags)
		{
		ALOGV("set(): inputSource %d, sampleRate %u, format %#x, channelMask %#x, frameCount %d, "
		"notificationFrames %d, sessionId %d, transferType %d, flags %#x",
		"notificationFrames %u, sessionId %d, transferType %d, flags %#x",
		inputSource, sampleRate, format, channelMask, frameCountInt, notificationFrames,
		sessionId, transferType, flags);

		@@ -803,7 +803,7 @@ nsecs_t AudioRecord::processAudioBuffer()
		}

		// Cache other fields that will be needed soon
		size_t notificationFrames = mNotificationFramesAct;
		uint32_t notificationFrames = mNotificationFramesAct;
		if (mRefreshRemaining) {
		mRefreshRemaining = false;
		mRemainingFrames = notificationFrames;

+5 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ AudioTrack::AudioTrack(
		audio_output_flags_t flags,
		callback_t cbf,
		void* user,
		int notificationFrames,
		uint32_t notificationFrames,
		int sessionId,
		transfer_type transferType,
		const audio_offload_info_t *offloadInfo,
		@@ -138,7 +138,7 @@ AudioTrack::AudioTrack(
		audio_output_flags_t flags,
		callback_t cbf,
		void* user,
		int notificationFrames,
		uint32_t notificationFrames,
		int sessionId,
		transfer_type transferType,
		const audio_offload_info_t *offloadInfo,
		@@ -186,7 +186,7 @@ status_t AudioTrack::set(
		audio_output_flags_t flags,
		callback_t cbf,
		void* user,
		int notificationFrames,
		uint32_t notificationFrames,
		const sp<IMemory>& sharedBuffer,
		bool threadCanCallJava,
		int sessionId,
		@@ -196,7 +196,7 @@ status_t AudioTrack::set(
		pid_t pid)
		{
		ALOGV("set(): streamType %d, sampleRate %u, format %#x, channelMask %#x, frameCount %d, "
		"flags #%x, notificationFrames %d, sessionId %d, transferType %d",
		"flags #%x, notificationFrames %u, sessionId %d, transferType %d",
		streamType, sampleRate, format, channelMask, frameCountInt, flags, notificationFrames,
		sessionId, transferType);

		@@ -1487,7 +1487,7 @@ nsecs_t AudioTrack::processAudioBuffer()
		// Cache other fields that will be needed soon
		uint32_t loopPeriod = mLoopPeriod;
		uint32_t sampleRate = mSampleRate;
		size_t notificationFrames = mNotificationFramesAct;
		uint32_t notificationFrames = mNotificationFramesAct;
		if (mRefreshRemaining) {
		mRefreshRemaining = false;
		mRemainingFrames = notificationFrames;

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ AudioSource::AudioSource(
		if (status == OK) {
		// make sure that the AudioRecord callback never returns more than the maximum
		// buffer size
		int frameCount = kMaxBufferSize / sizeof(int16_t) / channelCount;
		uint32_t frameCount = kMaxBufferSize / sizeof(int16_t) / channelCount;

		// make sure that the AudioRecord total buffer size is large enough
		size_t bufCount = 2;
		@@ -79,7 +79,7 @@ AudioSource::AudioSource(
		bufCount * frameCount,
		AudioRecordCallbackFunction,
		this,
		frameCount);
		frameCount /notificationFrames/);
		mInitCheck = mRecord->initCheck();
		} else {
		mInitCheck = status;