Merge "audio: Allow higher downstream latency" (8fac2557) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3220,13 +3220,16 @@ bool AudioFlinger::PlaybackThread::threadLoop()
	}		}
	if (status == OK) {		if (status == OK) {
	// verify downstream latency (we assume a max reasonable		// verify downstream latency (we assume a max reasonable
	// latency of 1 second).		// latency of 5 seconds).
	if (latencyMs >= 0. && latencyMs <= 1000.) {		const double minLatency = 0., maxLatency = 5000.;
			if (latencyMs >= minLatency && latencyMs <= maxLatency) {
	ALOGV("new downstream latency %lf ms", latencyMs);		ALOGV("new downstream latency %lf ms", latencyMs);
	downstreamLatencyStatMs.add(latencyMs);
	} else {		} else {
	ALOGD("out of range downstream latency %lf ms", latencyMs);		ALOGD("out of range downstream latency %lf ms", latencyMs);
			if (latencyMs < minLatency) latencyMs = minLatency;
			else if (latencyMs > maxLatency) latencyMs = maxLatency;
	}		}
			downstreamLatencyStatMs.add(latencyMs);
	}		}
	mAudioFlinger->mLock.unlock();		mAudioFlinger->mLock.unlock();
	}		}