Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord" (882469cf) · Commits · e / os / android_frameworks_av

media/libmedia/AudioRecord.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -516,11 +516,6 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		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;
		}

		// FIXME missing fast track frameCount logic
		mAwaitBoost = false;
		@@ -546,6 +541,11 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		void buffers = (char)cblk + sizeof(audio_track_cblk_t);

		mFrameCount = frameCount;
		// If IAudioRecord is re-created, don't let the requested frameCount
		// decrease. This can confuse clients that cache frameCount().
		if (frameCount > mReqFrameCount) {
		mReqFrameCount = frameCount;
		}

		// update proxy
		mProxy = new AudioRecordClientProxy(cblk, buffers, mFrameCount, mFrameSize);