Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack" (0f1f2826) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -473,9 +473,13 @@ private:

		status_t mStatus;

		size_t mFrameCount; // corresponds to current IAudioRecord, value is
		// reported back by AudioFlinger to the client
		size_t mReqFrameCount; // frame count to request the first or next time
		// a new IAudioRecord is needed, non-decreasing

		// constant after constructor or set()
		uint32_t mSampleRate;
		size_t mFrameCount;
		audio_format_t mFormat;
		uint32_t mChannelCount;
		size_t mFrameSize; // app-level frame size == AudioFlinger frame size

media/libmedia/AudioRecord.cpp

+16 −7

Original line number	Diff line number	Diff line
		@@ -228,7 +228,8 @@ status_t AudioRecord::set(
		ALOGE("frameCount %u < minFrameCount %u", frameCount, minFrameCount);
		return BAD_VALUE;
		}
		mFrameCount = frameCount;
		// mFrameCount is initialized in openRecord_l
		mReqFrameCount = frameCount;

		mNotificationFramesReq = notificationFrames;
		mNotificationFramesAct = 0;
		@@ -449,11 +450,12 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		}

		mNotificationFramesAct = mNotificationFramesReq;
		size_t frameCount = mReqFrameCount;

		if (!(mFlags & AUDIO_INPUT_FLAG_FAST)) {
		// Make sure that application is notified with sufficient margin before overrun
		if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > mFrameCount/2) {
		mNotificationFramesAct = mFrameCount/2;
		if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > frameCount/2) {
		mNotificationFramesAct = frameCount/2;
		}
		}

		@@ -467,7 +469,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		// Now that we have a reference to an I/O handle and have not yet handed it off to AudioFlinger,
		// we must release it ourselves if anything goes wrong.

		size_t temp = mFrameCount; // temp may be replaced by a revised value of frameCount,
		size_t temp = frameCount; // temp may be replaced by a revised value of frameCount,
		// but we will still need the original value also
		int originalSessionId = mSessionId;
		sp<IAudioRecord> record = audioFlinger->openRecord(input,
		@@ -510,10 +512,15 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer);
		mCblk = cblk;
		// note that temp is the (possibly revised) value of mFrameCount
		if (temp < mFrameCount \|\| (mFrameCount == 0 && temp == 0)) {
		ALOGW("Requested frameCount %u but received frameCount %u", mFrameCount, temp);
		if (temp < frameCount \|\| (frameCount == 0 && temp == 0)) {
		ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);
		}
		frameCount = temp;
		// If IAudioRecord is re-created, don't let the requested frameCount
		// decrease. This can confuse clients that cache frameCount().
		if (frameCount > mReqFrameCount) {
		mReqFrameCount = frameCount;
		}
		mFrameCount = temp;

		// FIXME missing fast track frameCount logic
		mAwaitBoost = false;
		@@ -538,6 +545,8 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		// starting address of buffers in shared memory
		void buffers = (char)cblk + sizeof(audio_track_cblk_t);

		mFrameCount = frameCount;

		// update proxy
		mProxy = new AudioRecordClientProxy(cblk, buffers, mFrameCount, mFrameSize);
		mProxy->setEpoch(epoch);