Merge "frameCountFromDurationUs: Avoid integer overflow" into main am: 4cf75592a3 am: 9f1b5aceac

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2824592

Change-Id: I476f60202942649e092be2e8515ba09562299301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2023-11-15 04:36:29 +00:00
committed by Automerger Merge Worker

View File

@@ -175,7 +175,7 @@ constexpr U makeBitPositionFlagMask(std::initializer_list<E> flags) {
}
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) {