Merge "Set timestamp correction and downstream latency logging as very... (ff9fc070) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -3483,7 +3483,7 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		// latency of 5 seconds).
		const double minLatency = 0., maxLatency = 5000.;
		if (latencyMs >= minLatency && latencyMs <= maxLatency) {
		ALOGV("new downstream latency %lf ms", latencyMs);
		ALOGVV("new downstream latency %lf ms", latencyMs);
		} else {
		ALOGD("out of range downstream latency %lf ms", latencyMs);
		if (latencyMs < minLatency) latencyMs = minLatency;
		@@ -3532,7 +3532,7 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		mSampleRate);

		if (isTimestampCorrectionEnabled()) {
		ALOGV("TS_BEFORE: %d %lld %lld", id(),
		ALOGVV("TS_BEFORE: %d %lld %lld", id(),
		(long long)timestamp.mTimeNs[ExtendedTimestamp::LOCATION_KERNEL],
		(long long)timestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL]);
		auto correctedTimestamp = mTimestampVerifier.getLastCorrectedTimestamp();
		@@ -3540,7 +3540,7 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		= correctedTimestamp.mFrames;
		timestamp.mTimeNs[ExtendedTimestamp::LOCATION_KERNEL]
		= correctedTimestamp.mTimeNs;
		ALOGV("TS_AFTER: %d %lld %lld", id(),
		ALOGVV("TS_AFTER: %d %lld %lld", id(),
		(long long)timestamp.mTimeNs[ExtendedTimestamp::LOCATION_KERNEL],
		(long long)timestamp.mPosition[ExtendedTimestamp::LOCATION_KERNEL]);

		@@ -7346,12 +7346,12 @@ reacquire_wakelock:

		// Correct timestamps
		if (isTimestampCorrectionEnabled()) {
		ALOGV("TS_BEFORE: %d %lld %lld",
		ALOGVV("TS_BEFORE: %d %lld %lld",
		id(), (long long)time, (long long)position);
		auto correctedTimestamp = mTimestampVerifier.getLastCorrectedTimestamp();
		position = correctedTimestamp.mFrames;
		time = correctedTimestamp.mTimeNs;
		ALOGV("TS_AFTER: %d %lld %lld",
		ALOGVV("TS_AFTER: %d %lld %lld",
		id(), (long long)time, (long long)position);
		}