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 | 10ac79930120efea20b125f5faedfe89e8674676 (patch) | |
| tree | a184430fecfcceecb117c2d4669c9b3331403250 /services/audioflinger/Threads.cpp | |
| parent | 32fbb48de0248518fc5a14099b32fe4b8e9fc102 (diff) | |
| parent | 5930e8ebdacf3a59c13eef11fd03658ba58b443e (diff) | |
| download | frameworks_av-10ac79930120efea20b125f5faedfe89e8674676.zip frameworks_av-10ac79930120efea20b125f5faedfe89e8674676.tar.gz frameworks_av-10ac79930120efea20b125f5faedfe89e8674676.tar.bz2 | |
am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
* commit '5930e8ebdacf3a59c13eef11fd03658ba58b443e':
AudioFlinger: Remove code for supporting resampling in fast tracks
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index cde997e..82f489a 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2973,7 +2973,6 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac VolumeProvider *vp = track; fastTrack->mBufferProvider = eabp; fastTrack->mVolumeProvider = vp; - fastTrack->mSampleRate = track->mSampleRate; fastTrack->mChannelMask = track->mChannelMask; fastTrack->mGeneration++; state->mTrackMask |= 1 << j; |