diff options
| author | raphael.kubo.da.costa <raphael.kubo.da.costa@intel.com> | 2015-02-24 04:01:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-24 12:02:17 +0000 |
| commit | 3f660206296719b15a7383e8fbeffc08530dea5e (patch) | |
| tree | 6b4d960b147a03e103ec9a34486374a3a1be82b4 /media/audio/android | |
| parent | 4e3301c82c48ac22439d1b9dc34ba05a0599e3e9 (diff) | |
| download | chromium_src-3f660206296719b15a7383e8fbeffc08530dea5e.zip chromium_src-3f660206296719b15a7383e8fbeffc08530dea5e.tar.gz chromium_src-3f660206296719b15a7383e8fbeffc08530dea5e.tar.bz2 | |
AudioManagerAndroid: Change stream destruction order.
AudioManagerBase::ReleaseOutputStream() deletes |stream|, so stop using
the pointer afterwards by removing it from |streams_| first.
Review URL: https://codereview.chromium.org/945893002
Cr-Commit-Position: refs/heads/master@{#317784}
Diffstat (limited to 'media/audio/android')
| -rw-r--r-- | media/audio/android/audio_manager_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc index 68dae3a..7f229e0 100644 --- a/media/audio/android/audio_manager_android.cc +++ b/media/audio/android/audio_manager_android.cc @@ -174,8 +174,8 @@ AudioInputStream* AudioManagerAndroid::MakeAudioInputStream( void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) { DCHECK(GetTaskRunner()->BelongsToCurrentThread()); - AudioManagerBase::ReleaseOutputStream(stream); streams_.erase(static_cast<OpenSLESOutputStream*>(stream)); + AudioManagerBase::ReleaseOutputStream(stream); } void AudioManagerAndroid::ReleaseInputStream(AudioInputStream* stream) { |