From eb9487e10294a4e73977f460f30eeaff503acd21 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 22 Jul 2015 09:15:17 -0700 Subject: Fix capture overruns at non-primary sample rate and small buffer size. Also: Pull out the magic number "12 ms" to a named constant. Remove obsolete AudioFlinger::mPrimaryOutputSampleRate. Bug: 22662814 Change-Id: I261f75a222c4505a84aad2493d251bd2dea59f68 --- services/audioflinger/Threads.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'services/audioflinger/Threads.cpp') diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index c360051..3057d9d 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -125,10 +125,15 @@ static const uint32_t kMinThreadSleepTimeUs = 5000; static const uint32_t kMaxThreadSleepTimeShift = 2; // minimum normal sink buffer size, expressed in milliseconds rather than frames +// FIXME This should be based on experimentally observed scheduling jitter static const uint32_t kMinNormalSinkBufferSizeMs = 20; // maximum normal sink buffer size static const uint32_t kMaxNormalSinkBufferSizeMs = 24; +// minimum capture buffer size in milliseconds to _not_ need a fast capture thread +// FIXME This should be based on experimentally observed scheduling jitter +static const uint32_t kMinNormalCaptureBufferSizeMs = 12; + // Offloaded output thread standby delay: allows track transition without going to standby static const nsecs_t kOffloadStandbyDelayNs = seconds(1); @@ -5490,20 +5495,7 @@ AudioFlinger::RecordThread::RecordThread(const sp& audioFlinger, initFastCapture = true; break; case FastCapture_Static: - uint32_t primaryOutputSampleRate; - { - AutoMutex _l(audioFlinger->mHardwareLock); - primaryOutputSampleRate = audioFlinger->mPrimaryOutputSampleRate; - } - initFastCapture = - // either capture sample rate is same as (a reasonable) primary output sample rate - ((isMusicRate(primaryOutputSampleRate) && - (mSampleRate == primaryOutputSampleRate)) || - // or primary output sample rate is unknown, and capture sample rate is reasonable - ((primaryOutputSampleRate == 0) && - isMusicRate(mSampleRate))) && - // and the buffer size is < 12 ms - (mFrameCount * 1000) / mSampleRate < 12; + initFastCapture = (mFrameCount * 1000) / mSampleRate < kMinNormalCaptureBufferSizeMs; break; // case FastCapture_Dynamic: } -- cgit v1.1