diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-02-10 18:17:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 18:17:02 +0000 |
| commit | 3523e8c40bc60af0c95d1aa71a51a13d69ec80a2 (patch) | |
| tree | 92a10a14b54f22f8b4af00dd493d6514b585473f /services/audioflinger/Threads.cpp | |
| parent | 2ca060c742a47034cea0ad2fb4aa10f0d6b59a09 (diff) | |
| parent | 4e12dadeec10993d2f77cce96600e73ca0dd86e2 (diff) | |
| download | frameworks_av-3523e8c40bc60af0c95d1aa71a51a13d69ec80a2.zip frameworks_av-3523e8c40bc60af0c95d1aa71a51a13d69ec80a2.tar.gz frameworks_av-3523e8c40bc60af0c95d1aa71a51a13d69ec80a2.tar.bz2 | |
am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
* commit '4e12dadeec10993d2f77cce96600e73ca0dd86e2':
AudioTrack: Never try to use the fast path if resampling is required
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index e2ef53d..165a21e 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1275,10 +1275,8 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac // mono or stereo ( (channelMask == AUDIO_CHANNEL_OUT_MONO) || (channelMask == AUDIO_CHANNEL_OUT_STEREO) ) && -#ifndef FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE // hardware sample rate (sampleRate == mSampleRate) && -#endif // normal mixer has an associated fast mixer hasFastMixer() && // there are sufficient fast track slots available |