commit 5c4f82623287b09db3a8131dbe4508893648be90
author Phil Burk <philburk@google.com> Fri Nov 17 12:16:22 2017 -0800
committer Phil Burk <philburk@google.com> Wed Aug 29 00:18:11 2018 +0000
tree 612ad7601c094717b1b586818ecc32e6db821022
parent 0d97cec0533f47237b16b294fd92a827f2ebdc6f

aaudio: clip setBufferSizeInFrames()

Bug: 69469801
Test: test_various.cpp
Change-Id: I8ce9a6ef19ed2bf12aa1d618b6a4095c94797636

media/libaaudio/src/fifo/FifoControllerBase.cpp

diff --git a/media/libaaudio/src/fifo/FifoControllerBase.cpp b/media/libaaudio/src/fifo/FifoControllerBase.cpp
index 14a2be1..9885cb0 100644
--- a/media/libaaudio/src/fifo/FifoControllerBase.cpp
+++ b/media/libaaudio/src/fifo/FifoControllerBase.cpp
@@ -59,5 +59,10 @@
 }
 
 void FifoControllerBase::setThreshold(fifo_frames_t threshold) {
+    if (threshold > mCapacity) {
+        threshold = mCapacity;
+    } else if (threshold < 0) {
+        threshold = 0;
+    }
     mThreshold = threshold;
 }

media/libaaudio/src/fifo/FifoControllerBase.h

diff --git a/media/libaaudio/src/fifo/FifoControllerBase.h b/media/libaaudio/src/fifo/FifoControllerBase.h
index 64af777..1edb8a3 100644
--- a/media/libaaudio/src/fifo/FifoControllerBase.h
+++ b/media/libaaudio/src/fifo/FifoControllerBase.h
@@ -102,6 +102,9 @@
     /**
      * You can request that the buffer not be filled above a maximum
      * number of frames.
+     *
+     * The threshold will be clipped between zero and the buffer capacity.
+     *
      * @param threshold effective size of the buffer
      */
     void setThreshold(fifo_frames_t threshold);