diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-02-10 18:17:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 18:17:03 +0000 |
| commit | 4b76d27d6c4751b31a1cb8ac5e6da1d4b7724a7b (patch) | |
| tree | 6267e0bfdad4d8d5c0e8b768629d13f963a7872a /services/audioflinger/Threads.cpp | |
| parent | 3523e8c40bc60af0c95d1aa71a51a13d69ec80a2 (diff) | |
| parent | 5a458ede3b7d303723fde4b856532bdc3b94971b (diff) | |
| download | frameworks_av-4b76d27d6c4751b31a1cb8ac5e6da1d4b7724a7b.zip frameworks_av-4b76d27d6c4751b31a1cb8ac5e6da1d4b7724a7b.tar.gz frameworks_av-4b76d27d6c4751b31a1cb8ac5e6da1d4b7724a7b.tar.bz2 | |
am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
* commit '5a458ede3b7d303723fde4b856532bdc3b94971b':
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 165a21e..fc98867 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3031,7 +3031,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; |