commit ace6feea9e956df06cfa75c0d2698c12d1477f34
author Andy Hung <hunga@google.com> Sat Jun 02 00:12:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 02 00:12:49 2018 +0000
tree 2b648ed0b2f135543c2f3af92c4445025815dcae
parent 489f1274fcae4485c8a9036767e62f747f980ac5
parent 885957513e8e86453bac323de6f6e562cc174050

Merge "AudioTimestamp: check zero sample rate in latency computation"

media/libaudioclient/include/media/AudioTimestamp.h

diff --git a/media/libaudioclient/include/media/AudioTimestamp.h b/media/libaudioclient/include/media/AudioTimestamp.h
index 2cd8c87..e5925dd 100644
--- a/media/libaudioclient/include/media/AudioTimestamp.h
+++ b/media/libaudioclient/include/media/AudioTimestamp.h
@@ -140,7 +140,7 @@
     }
 
     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 =