Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(853)

Side by Side Diff: media/audio/android/audio_manager_android.h

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 5 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
6 #define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 6 #define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/synchronization/waitable_event.h" 13 #include "base/synchronization/waitable_event.h"
14 #include "media/audio/audio_manager_base.h" 14 #include "media/audio/audio_manager_base.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 class OpenSLESOutputStream; 18 class OpenSLESOutputStream;
19 19
20 // Android implemention of AudioManager. 20 // Android implemention of AudioManager.
21 class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { 21 class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
22 public: 22 public:
23 AudioManagerAndroid( 23 AudioManagerAndroid(std::unique_ptr<AudioThread> audio_thread,
24 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 24 AudioLogFactory* audio_log_factory);
25 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, 25 ~AudioManagerAndroid() override;
26 AudioLogFactory* audio_log_factory);
27 26
28 void InitializeIfNeeded(); 27 void InitializeIfNeeded();
29 28
30 // Implementation of AudioManager. 29 // Implementation of AudioManager.
31 bool HasAudioOutputDevices() override; 30 bool HasAudioOutputDevices() override;
32 bool HasAudioInputDevices() override; 31 bool HasAudioInputDevices() override;
33 void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; 32 void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
34 void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; 33 void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
35 AudioParameters GetInputStreamParameters( 34 AudioParameters GetInputStreamParameters(
36 const std::string& device_id) override; 35 const std::string& device_id) override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 void SetMute(JNIEnv* env, 68 void SetMute(JNIEnv* env,
70 const base::android::JavaParamRef<jobject>& obj, 69 const base::android::JavaParamRef<jobject>& obj,
71 jboolean muted); 70 jboolean muted);
72 71
73 // Sets a volume that applies to all this manager's output audio streams. 72 // Sets a volume that applies to all this manager's output audio streams.
74 // This overrides other SetVolume calls (e.g. through AudioHostMsg_SetVolume). 73 // This overrides other SetVolume calls (e.g. through AudioHostMsg_SetVolume).
75 void SetOutputVolumeOverride(double volume); 74 void SetOutputVolumeOverride(double volume);
76 bool HasOutputVolumeOverride(double* out_volume) const; 75 bool HasOutputVolumeOverride(double* out_volume) const;
77 76
78 protected: 77 protected:
79 ~AudioManagerAndroid() override; 78 void ShutdownOnAudioThread() override;
80
81 AudioParameters GetPreferredOutputStreamParameters( 79 AudioParameters GetPreferredOutputStreamParameters(
82 const std::string& output_device_id, 80 const std::string& output_device_id,
83 const AudioParameters& input_params) override; 81 const AudioParameters& input_params) override;
84 82
85 private: 83 private:
86 jobject GetJavaAudioManager(); 84 jobject GetJavaAudioManager();
87 bool HasNoAudioInputStreams(); 85 bool HasNoAudioInputStreams();
88 void SetCommunicationAudioModeOn(bool on); 86 void SetCommunicationAudioModeOn(bool on);
89 bool SetAudioDevice(const std::string& device_id); 87 bool SetAudioDevice(const std::string& device_id);
90 int GetNativeOutputSampleRate(); 88 int GetNativeOutputSampleRate();
(...skipping 17 matching lines...) Expand all
108 // If set, overrides volume level on output streams 106 // If set, overrides volume level on output streams
109 bool output_volume_override_set_; 107 bool output_volume_override_set_;
110 double output_volume_override_; 108 double output_volume_override_;
111 109
112 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 110 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
113 }; 111 };
114 112
115 } // namespace media 113 } // namespace media
116 114
117 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 115 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
OLDNEW
« no previous file with comments | « media/audio/android/audio_android_unittest.cc ('k') | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698