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

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

Issue 1901583005: Revert of Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 explicit AudioManagerAndroid(AudioLogFactory* audio_log_factory);
24 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
25 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
26 AudioLogFactory* audio_log_factory);
27 24
28 // Implementation of AudioManager. 25 // Implementation of AudioManager.
29 bool HasAudioOutputDevices() override; 26 bool HasAudioOutputDevices() override;
30 bool HasAudioInputDevices() override; 27 bool HasAudioInputDevices() override;
31 void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; 28 void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
32 void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; 29 void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
33 AudioParameters GetInputStreamParameters( 30 AudioParameters GetInputStreamParameters(
34 const std::string& device_id) override; 31 const std::string& device_id) override;
35 32
36 AudioOutputStream* MakeAudioOutputStream( 33 AudioOutputStream* MakeAudioOutputStream(
(...skipping 30 matching lines...) Expand all
67 64
68 protected: 65 protected:
69 ~AudioManagerAndroid() override; 66 ~AudioManagerAndroid() override;
70 67
71 AudioParameters GetPreferredOutputStreamParameters( 68 AudioParameters GetPreferredOutputStreamParameters(
72 const std::string& output_device_id, 69 const std::string& output_device_id,
73 const AudioParameters& input_params) override; 70 const AudioParameters& input_params) override;
74 71
75 private: 72 private:
76 void InitializeOnAudioThread(); 73 void InitializeOnAudioThread();
74 void ShutdownOnAudioThread();
77 75
78 bool HasNoAudioInputStreams(); 76 bool HasNoAudioInputStreams();
79 void SetCommunicationAudioModeOn(bool on); 77 void SetCommunicationAudioModeOn(bool on);
80 bool SetAudioDevice(const std::string& device_id); 78 bool SetAudioDevice(const std::string& device_id);
81 int GetNativeOutputSampleRate(); 79 int GetNativeOutputSampleRate();
82 bool IsAudioLowLatencySupported(); 80 bool IsAudioLowLatencySupported();
83 int GetAudioLowLatencyOutputFrameSize(); 81 int GetAudioLowLatencyOutputFrameSize();
84 int GetOptimalOutputFrameSize(int sample_rate, int channels); 82 int GetOptimalOutputFrameSize(int sample_rate, int channels);
85 83
86 void DoSetMuteOnAudioThread(bool muted); 84 void DoSetMuteOnAudioThread(bool muted);
(...skipping 12 matching lines...) Expand all
99 // If set, overrides volume level on output streams 97 // If set, overrides volume level on output streams
100 bool output_volume_override_set_; 98 bool output_volume_override_set_;
101 double output_volume_override_; 99 double output_volume_override_;
102 100
103 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 101 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
104 }; 102 };
105 103
106 } // namespace media 104 } // namespace media
107 105
108 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 106 #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