diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-07 02:26:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:26:05 +0000 |
| commit | 32fbb48de0248518fc5a14099b32fe4b8e9fc102 (patch) | |
| tree | 44c01484475c34374a8a7cdcbab31ec84ac03a55 /services | |
| parent | d224ee56ec8c2bc7963f43ca9d80cf31a3ba4c57 (diff) | |
| parent | 4361749d74113069aafb0620a1189404205c58d0 (diff) | |
| download | frameworks_av-32fbb48de0248518fc5a14099b32fe4b8e9fc102.zip frameworks_av-32fbb48de0248518fc5a14099b32fe4b8e9fc102.tar.gz frameworks_av-32fbb48de0248518fc5a14099b32fe4b8e9fc102.tar.bz2 | |
am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
* commit '4361749d74113069aafb0620a1189404205c58d0':
AudioTrack: Never try to use the fast path if resampling is required
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Configuration.h | 3 | ||||
| -rw-r--r-- | services/audioflinger/Threads.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/services/audioflinger/Configuration.h b/services/audioflinger/Configuration.h index bc2038a..0754d9d 100644 --- a/services/audioflinger/Configuration.h +++ b/services/audioflinger/Configuration.h @@ -32,9 +32,6 @@ // uncomment to enable fast mixer to take performance samples for later statistical analysis #define FAST_MIXER_STATISTICS -// uncomment to allow fast tracks at non-native sample rate -//#define FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE - // uncomment for debugging timing problems related to StateQueue::push() //#define STATE_QUEUE_DUMP diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 3d657b3..cde997e 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1218,10 +1218,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 |