diff options
author | Glenn Kasten <gkasten@google.com> | 2013-08-08 15:20:53 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-08-08 16:15:09 -0700 |
commit | 4a0efb77198c69df711ab369ac482a42dbdfab07 (patch) | |
tree | fd5d862458cc562d12feb525c8b94a81bcfbdb85 /media/libmedia/AudioRecord.cpp | |
parent | f31abb4ee82050030b3e5a0793bb2b8e30f40d31 (diff) | |
download | frameworks_av-4a0efb77198c69df711ab369ac482a42dbdfab07.zip frameworks_av-4a0efb77198c69df711ab369ac482a42dbdfab07.tar.gz frameworks_av-4a0efb77198c69df711ab369ac482a42dbdfab07.tar.bz2 |
Fix regression for AudioRecord streaming callback mode
The notification period (frequency of client wakeups) was broken in
streaming callback mode. Fast tracks were OK, but non-fast tracks with
normal latency weren't getting woken up at all.
Bug: 10222943
Change-Id: Ife9a2f57fa73c6eb921f1c5ba62de0bfcc20557b
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 2718420..616c3d6 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -245,9 +245,8 @@ status_t AudioRecord::set( return BAD_VALUE; } - if (notificationFrames == 0) { - notificationFrames = frameCount/2; - } + mNotificationFramesReq = notificationFrames; + mNotificationFramesAct = 0; // create the IAudioRecord status = openRecord_l(sampleRate, format, frameCount, mFlags, input, 0 /*epoch*/); @@ -267,8 +266,6 @@ status_t AudioRecord::set( mActive = false; mCbf = cbf; - mNotificationFramesReq = notificationFrames; - mNotificationFramesAct = 0; mRefreshRemaining = true; mUserData = user; // TODO: add audio hardware input latency here @@ -464,6 +461,15 @@ status_t AudioRecord::openRecord_l( } } + mNotificationFramesAct = mNotificationFramesReq; + + if (!(flags & AUDIO_INPUT_FLAG_FAST)) { + // Make sure that application is notified with sufficient margin before overrun + if (mNotificationFramesAct == 0 || mNotificationFramesAct > frameCount/2) { + mNotificationFramesAct = frameCount/2; + } + } + int originalSessionId = mSessionId; sp<IAudioRecord> record = audioFlinger->openRecord(input, sampleRate, format, @@ -495,7 +501,6 @@ status_t AudioRecord::openRecord_l( mCblk = cblk; // FIXME missing fast track frameCount logic mAwaitBoost = false; - mNotificationFramesAct = mNotificationFramesReq; if (flags & AUDIO_INPUT_FLAG_FAST) { if (trackFlags & IAudioFlinger::TRACK_FAST) { ALOGV("AUDIO_INPUT_FLAG_FAST successful; frameCount %u", frameCount); |