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

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

Issue 893363002: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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
« no previous file with comments | « media/audio/android/audio_android_unittest.cc ('k') | media/audio/android/audio_record_input.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/gtest_prod_util.h" 11 #include "base/gtest_prod_util.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(AudioLogFactory* audio_log_factory); 23 AudioManagerAndroid(AudioLogFactory* audio_log_factory);
24 24
25 // Implementation of AudioManager. 25 // Implementation of AudioManager.
26 virtual bool HasAudioOutputDevices() override; 26 bool HasAudioOutputDevices() override;
27 virtual bool HasAudioInputDevices() override; 27 bool HasAudioInputDevices() override;
28 virtual void GetAudioInputDeviceNames( 28 void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
29 AudioDeviceNames* device_names) override; 29 void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
30 virtual void GetAudioOutputDeviceNames( 30 AudioParameters GetInputStreamParameters(
31 AudioDeviceNames* device_names) override;
32 virtual AudioParameters GetInputStreamParameters(
33 const std::string& device_id) override; 31 const std::string& device_id) override;
34 32
35 virtual AudioOutputStream* MakeAudioOutputStream( 33 AudioOutputStream* MakeAudioOutputStream(
36 const AudioParameters& params, 34 const AudioParameters& params,
37 const std::string& device_id) override; 35 const std::string& device_id) override;
38 virtual AudioInputStream* MakeAudioInputStream( 36 AudioInputStream* MakeAudioInputStream(const AudioParameters& params,
37 const std::string& device_id) override;
38 void ReleaseOutputStream(AudioOutputStream* stream) override;
39 void ReleaseInputStream(AudioInputStream* stream) override;
40
41 // Implementation of AudioManagerBase.
42 AudioOutputStream* MakeLinearOutputStream(
43 const AudioParameters& params) override;
44 AudioOutputStream* MakeLowLatencyOutputStream(
39 const AudioParameters& params, 45 const AudioParameters& params,
40 const std::string& device_id) override; 46 const std::string& device_id) override;
41 virtual void ReleaseOutputStream(AudioOutputStream* stream) override; 47 AudioInputStream* MakeLinearInputStream(
42 virtual void ReleaseInputStream(AudioInputStream* stream) override;
43
44 // Implementation of AudioManagerBase.
45 virtual AudioOutputStream* MakeLinearOutputStream(
46 const AudioParameters& params) override;
47 virtual AudioOutputStream* MakeLowLatencyOutputStream(
48 const AudioParameters& params, 48 const AudioParameters& params,
49 const std::string& device_id) override; 49 const std::string& device_id) override;
50 virtual AudioInputStream* MakeLinearInputStream( 50 AudioInputStream* MakeLowLatencyInputStream(
51 const AudioParameters& params,
52 const std::string& device_id) override;
53 virtual AudioInputStream* MakeLowLatencyInputStream(
54 const AudioParameters& params, 51 const AudioParameters& params,
55 const std::string& device_id) override; 52 const std::string& device_id) override;
56 53
57 static bool RegisterAudioManager(JNIEnv* env); 54 static bool RegisterAudioManager(JNIEnv* env);
58 55
59 void SetMute(JNIEnv* env, jobject obj, jboolean muted); 56 void SetMute(JNIEnv* env, jobject obj, jboolean muted);
60 57
61 protected: 58 protected:
62 virtual ~AudioManagerAndroid(); 59 ~AudioManagerAndroid() override;
63 60
64 virtual AudioParameters GetPreferredOutputStreamParameters( 61 AudioParameters GetPreferredOutputStreamParameters(
65 const std::string& output_device_id, 62 const std::string& output_device_id,
66 const AudioParameters& input_params) override; 63 const AudioParameters& input_params) override;
67 64
68 private: 65 private:
69 void InitializeOnAudioThread(); 66 void InitializeOnAudioThread();
70 void ShutdownOnAudioThread(); 67 void ShutdownOnAudioThread();
71 68
72 bool HasNoAudioInputStreams(); 69 bool HasNoAudioInputStreams();
73 void SetCommunicationAudioModeOn(bool on); 70 void SetCommunicationAudioModeOn(bool on);
74 bool SetAudioDevice(const std::string& device_id); 71 bool SetAudioDevice(const std::string& device_id);
(...skipping 13 matching lines...) Expand all
88 // Enabled when first input stream is created and set to false when last 85 // Enabled when first input stream is created and set to false when last
89 // input stream is destroyed. Also affects the stream type of output streams. 86 // input stream is destroyed. Also affects the stream type of output streams.
90 bool communication_mode_is_on_; 87 bool communication_mode_is_on_;
91 88
92 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 89 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
93 }; 90 };
94 91
95 } // namespace media 92 } // namespace media
96 93
97 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 94 #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_record_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698