diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-09 21:34:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 21:34:24 +0000 |
| commit | b4f18f964cba9f124e5a264428290ada6eb4aa00 (patch) | |
| tree | 758ad996c40893bbb89b04b248f2cb28e35dc448 /services | |
| parent | 172e2c5a41275efbd5a9c343fa8b8c4c653061b4 (diff) | |
| parent | 1dfe2f9c2d03fc8d0ed0cdfe0b9fb894bc0bcc11 (diff) | |
| download | frameworks_av-b4f18f964cba9f124e5a264428290ada6eb4aa00.zip frameworks_av-b4f18f964cba9f124e5a264428290ada6eb4aa00.tar.gz frameworks_av-b4f18f964cba9f124e5a264428290ada6eb4aa00.tar.bz2 | |
Merge "Allow TRANSFER_OBTAIN to be used for fast tracks"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 92bd295..c1da6bc 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1550,9 +1550,10 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac ( (sharedBuffer != 0) ) || - // use case 2: callback handler and frame count is default or at least as large as HAL + // use case 2: frame count is default or at least as large as HAL ( - (tid != -1) && + // we formerly checked for a callback handler (non-0 tid), + // but that is no longer required for TRANSFER_OBTAIN mode ((frameCount == 0) || (frameCount >= mFrameCount)) ) |