From 885957513e8e86453bac323de6f6e562cc174050 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Fri, 1 Jun 2018 15:21:47 -0700 Subject: [PATCH] AudioTimestamp: check zero sample rate in latency computation Test: compile, no material difference Change-Id: I27a49ee56a16cec6937ca493ba4b1fbe0bb4121e --- media/libaudioclient/include/media/AudioTimestamp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libaudioclient/include/media/AudioTimestamp.h b/media/libaudioclient/include/media/AudioTimestamp.h index 2cd8c87987..e5925dd942 100644 --- a/media/libaudioclient/include/media/AudioTimestamp.h +++ b/media/libaudioclient/include/media/AudioTimestamp.h @@ -140,7 +140,7 @@ struct alignas(8) /* bug 29096183, bug 29108507 */ ExtendedTimestamp { } double getLatencyMs(uint32_t sampleRate, Location location1, Location location2) const { - if (mTimeNs[location1] > 0 && mTimeNs[location2] > 0) { + if (sampleRate > 0 && mTimeNs[location1] > 0 && mTimeNs[location2] > 0) { const int64_t frameDifference = mPosition[location1] - mPosition[location2]; const int64_t timeDifferenceNs =