| commit | a5855a159247a97aa1088aadaa09815dbd1a8af0 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Fri Mar 22 03:53:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 22 03:53:32 2024 +0000 |
| tree | c54fb29611543f745df0a1121a7d07c53e7425cd | |
| parent | c809659a6c813aabed9ee6b914dca12a6d8f49c2 [diff] | |
| parent | 222d03446155c08e3b63c191ff068184c9a51fb1 [diff] |
Merge "audio: Adjust stream buffer size calculation" into main am: 222d034461 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3008508 Change-Id: I47bd8717653bc48d3fde37c139f373e6d7bce517 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/include/core-impl/Module.h b/audio/aidl/default/include/core-impl/Module.h index d6e8905..a326217 100644 --- a/audio/aidl/default/include/core-impl/Module.h +++ b/audio/aidl/default/include/core-impl/Module.h
@@ -213,7 +213,7 @@ sampleRateHz); // Round up to nearest 16 frames since in the framework this is the size of a mixer burst. const int32_t multipleOf16 = (rawSizeFrames + 15) & ~15; - if (multipleOf16 <= 512) return multipleOf16; + if (sampleRateHz < 44100 || multipleOf16 <= 512) return multipleOf16; // Larger buffers should use powers of 2. int32_t powerOf2 = 1; while (powerOf2 < multipleOf16) powerOf2 <<= 1;