summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorAshish Jain <ashishj@codeaurora.org>2016-01-19 17:32:00 +0530
committerSteve Kondik <steve@cyngn.com>2016-02-01 17:23:51 -0800
commitfda1413978cabfafdf184c02aa20d2fd8c095616 (patch)
treef183ce49e543a93b447148bfef36694570b30dec /services/audioflinger
parentda6f52df74ff57a79ab5c338b6f7b4124b47e133 (diff)
downloadframeworks_av-fda1413978cabfafdf184c02aa20d2fd8c095616.zip
frameworks_av-fda1413978cabfafdf184c02aa20d2fd8c095616.tar.gz
frameworks_av-fda1413978cabfafdf184c02aa20d2fd8c095616.tar.bz2
Revert "AudioMixer: delete reformatBuffer provider in proper order"
This reverts commit 415bcac8afac7aef3e9853cfe4a0f2a0eb2f04ad. Change-Id: Ibbc35f16ef8cd17ead72498178c3e7bca1dff3cc
Diffstat (limited to 'services/audioflinger')
-rw-r--r--services/audioflinger/AudioMixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index bc062e6..806eaf1 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -441,10 +441,10 @@ void AudioMixer::deleteTrackName(int name)
// delete the resampler
delete track.resampler;
track.resampler = NULL;
- // delete the reformatter
- mState.tracks[name].unprepareForReformat();
// delete the downmixer
mState.tracks[name].unprepareForDownmix();
+ // delete the reformatter
+ mState.tracks[name].unprepareForReformat();
// delete the timestretch provider
delete track.mTimestretchBufferProvider;
track.mTimestretchBufferProvider = NULL;