summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-02-28 19:49:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-28 19:49:48 +0000
commit33ca5cf8826f5fcd9c011e8d336138b62d982f2a (patch)
tree19546ee5a21f0706d2d190f840b056f8fd278ef2 /media/libmedia/AudioTrack.cpp
parent9cf4f07c2dc5d4f14bfd1adee691667eb55882ec (diff)
parentc6ba823a397abf865b02f4f48fe18231f94d8e87 (diff)
downloadframeworks_av-33ca5cf8826f5fcd9c011e8d336138b62d982f2a.zip
frameworks_av-33ca5cf8826f5fcd9c011e8d336138b62d982f2a.tar.gz
frameworks_av-33ca5cf8826f5fcd9c011e8d336138b62d982f2a.tar.bz2
Merge "Make openRecord_l more like createTrack_l for fast tracks: part 1"
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index f85b0ce..d25c40b 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -885,8 +885,8 @@ status_t AudioTrack::createTrack_l(size_t epoch)
// either of these use cases:
// use case 1: shared buffer
(mSharedBuffer != 0) ||
- // use case 2: callback handler
- (mCbf != NULL)) &&
+ // use case 2: callback transfer mode
+ (mTransfer == TRANSFER_CALLBACK)) &&
// matching sample rate
(mSampleRate == afSampleRate))) {
ALOGW("AUDIO_OUTPUT_FLAG_FAST denied by client");