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 /media | |
| 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 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 720db17..0ad9cc0 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1002,7 +1002,9 @@ status_t AudioTrack::createTrack_l() // use case 1: shared buffer (mSharedBuffer != 0) || // use case 2: callback transfer mode - (mTransfer == TRANSFER_CALLBACK)) && + (mTransfer == TRANSFER_CALLBACK) || + // use case 3: obtain/release mode + (mTransfer == TRANSFER_OBTAIN)) && // matching sample rate (mSampleRate == afSampleRate))) { ALOGW("AUDIO_OUTPUT_FLAG_FAST denied by client"); |