| commit | 7f50205333bbab0687ed049fcb09263d2ccc757f | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Fri Mar 22 04:08:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 22 04:08:11 2024 +0000 |
| tree | 7d18dc75cb375d9bc5cd393cfde3e64cf5798204 | |
| parent | 012679e371c38bba42fe3c6791768b13929de8b6 [diff] | |
| parent | a5855a159247a97aa1088aadaa09815dbd1a8af0 [diff] |
Merge "audio: Adjust stream buffer size calculation" into main am: 222d034461 am: a5855a1592 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3008508 Change-Id: I8484832349e3af69cec9ca2a56f315f225b83427 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;