| commit | 43c2a823beba7ed3897e33b009e7792a31ef8307 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Wed Nov 15 04:06:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 15 04:06:02 2023 +0000 |
| tree | 9342b0862d7af10b7c68e84eef9b0190ee6bdba9 | |
| parent | dd10e1ec2c281fb7c1e758b31948a1b0c432590d [diff] | |
| parent | 4cf75592a3a196c1f8289e3f94e53b4130cffbdb [diff] |
Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592 Change-Id: Ibb7f67de36967b1b7775217536fdb2b5deabdd07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/common/include/Utils.h b/audio/aidl/common/include/Utils.h index 59ca92a..ef312d5 100644 --- a/audio/aidl/common/include/Utils.h +++ b/audio/aidl/common/include/Utils.h
@@ -175,7 +175,7 @@ } constexpr int32_t frameCountFromDurationUs(long durationUs, int32_t sampleRateHz) { - return (durationUs * sampleRateHz) / 1000000LL; + return (static_cast<long long>(durationUs) * sampleRateHz) / 1000000LL; } constexpr int32_t frameCountFromDurationMs(int32_t durationMs, int32_t sampleRateHz) {