Merge "aaudio: clip setBufferSizeInFrames()"
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;
}
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);