Merge "Vary tee sink frame count based on sample rate" into main
diff --git a/services/audioflinger/afutils/NBAIO_Tee.h b/services/audioflinger/afutils/NBAIO_Tee.h
index 1133671..13335fe 100644
--- a/services/audioflinger/afutils/NBAIO_Tee.h
+++ b/services/audioflinger/afutils/NBAIO_Tee.h
@@ -199,8 +199,8 @@
// determine number of frames for Tee
if (frames == 0) {
- // TODO: consider varying frame count based on type.
- frames = DEFAULT_TEE_FRAMES;
+ frames = (static_cast<long long>(DEFAULT_TEE_DURATION_MS) * format.mSampleRate)
+ / MILLIS_PER_SECOND;
}
// TODO: should we check minimum number of frames?
@@ -261,8 +261,7 @@
static NBAIO_SinkSource makeSinkSource(
const NBAIO_Format &format, size_t frames, bool *enabled);
- // 0x200000 stereo 16-bit PCM frames = 47.5 seconds at 44.1 kHz, 8 megabytes
- static constexpr size_t DEFAULT_TEE_FRAMES = 0x200000;
+ static constexpr size_t DEFAULT_TEE_DURATION_MS = 60'000;
// atomic status checking
std::atomic<bool> mEnabled{false};