Merge "Unify comments and whitespace between AudioTrack and AudioRecord" (7c1b8941) · Commits · e / os / android_frameworks_av

media/libmedia/AudioRecord.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ status_t AudioRecord::set(
		return INVALID_OPERATION;
		}

		// handle default values first.
		if (inputSource == AUDIO_SOURCE_DEFAULT) {
		inputSource = AUDIO_SOURCE_MIC;
		}
		@@ -511,7 +512,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		mCblkMemory = iMem;
		audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer);
		mCblk = cblk;
		// note that temp is the (possibly revised) value of mFrameCount
		// note that temp is the (possibly revised) value of frameCount
		if (temp < frameCount \|\| (frameCount == 0 && temp == 0)) {
		ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1039,6 +1039,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
		mDeathNotifier.clear();
		}
		mAudioTrack = track;

		mCblkMemory = iMem;
		audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer);
		mCblk = cblk;
		@@ -1050,6 +1051,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
		ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);
		}
		frameCount = temp;

		mAwaitBoost = false;
		if (mFlags & AUDIO_OUTPUT_FLAG_FAST) {
		if (trackFlags & IAudioFlinger::TRACK_FAST) {
		@@ -1103,6 +1105,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
		mAudioTrack->attachAuxEffect(mAuxEffectId);
		// FIXME don't believe this lie
		mLatency = afLatency + (1000*frameCount) / mSampleRate;

		mFrameCount = frameCount;
		// If IAudioTrack is re-created, don't let the requested frameCount
		// decrease. This can confuse clients that cache frameCount().