diff options
| author | rtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 18:21:59 +0000 |
|---|---|---|
| committer | rtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 18:21:59 +0000 |
| commit | e7c28cb150eb571397c704e7d771db29d46ff8b7 (patch) | |
| tree | d353e96a73c3263a3e0b08f3c7c36a5c81d7e34b /media | |
| parent | 54a83ee95257f62bd1c06238449e1598f93b1a42 (diff) | |
| download | chromium_src-e7c28cb150eb571397c704e7d771db29d46ff8b7.zip chromium_src-e7c28cb150eb571397c704e7d771db29d46ff8b7.tar.gz chromium_src-e7c28cb150eb571397c704e7d771db29d46ff8b7.tar.bz2 | |
Destroy the openSLES objects in the correct order on Android.
BUG=
Glenn Kasten says the player should be destroyed before the OutputMix.
R=tommi@chromium.org
Review URL: https://codereview.chromium.org/15204003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/android/opensles_output.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/android/opensles_output.cc b/media/audio/android/opensles_output.cc index 36a1408..7925515 100644 --- a/media/audio/android/opensles_output.cc +++ b/media/audio/android/opensles_output.cc @@ -109,8 +109,8 @@ void OpenSLESOutputStream::Close() { // Explicitly free the player objects and invalidate their associated // interfaces. They have to be done in the correct order. - output_mixer_.Reset(); player_object_.Reset(); + output_mixer_.Reset(); engine_object_.Reset(); simple_buffer_queue_ = NULL; player_ = NULL; |