diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-25 10:09:11 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-25 12:50:26 -0700 |
| commit | 9e8fcbcd8efa51d70d1207ff57bfbfe31324287a (patch) | |
| tree | 43dae12b292fcfe0ab9ed12c57f26a170b16b807 /services | |
| parent | fc5ea08326b510c6f82f71845d95a8758a6ab698 (diff) | |
| download | frameworks_av-9e8fcbcd8efa51d70d1207ff57bfbfe31324287a.zip frameworks_av-9e8fcbcd8efa51d70d1207ff57bfbfe31324287a.tar.gz frameworks_av-9e8fcbcd8efa51d70d1207ff57bfbfe31324287a.tar.bz2 | |
Move delete AudioMixer closer to point of re-allocation
No need to delete AudioMixer before readOutputParameters
Change-Id: Icafa785c9021bbe8d985e4f9527f8fc8c5e62622
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index f27d908..6451cce 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3035,10 +3035,8 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() keyValuePair.string()); } if (status == NO_ERROR && reconfig) { - delete mAudioMixer; - // for safety in case readOutputParameters() accesses mAudioMixer (it doesn't) - mAudioMixer = NULL; readOutputParameters(); + delete mAudioMixer; mAudioMixer = new AudioMixer(mNormalFrameCount, mSampleRate); for (size_t i = 0; i < mTracks.size() ; i++) { int name = getTrackName_l(mTracks[i]->mChannelMask, mTracks[i]->mSessionId); |