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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 163343002: Reland 153623004: Remove the unified IO code on the browser (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed the cras bot Created 6 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_manager_android.cc » ('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"
(...skipping 15 matching lines...) Expand all
26 virtual bool HasAudioInputDevices() OVERRIDE; 26 virtual bool HasAudioInputDevices() OVERRIDE;
27 virtual void GetAudioInputDeviceNames( 27 virtual void GetAudioInputDeviceNames(
28 AudioDeviceNames* device_names) OVERRIDE; 28 AudioDeviceNames* device_names) OVERRIDE;
29 virtual void GetAudioOutputDeviceNames( 29 virtual void GetAudioOutputDeviceNames(
30 AudioDeviceNames* device_names) OVERRIDE; 30 AudioDeviceNames* device_names) OVERRIDE;
31 virtual AudioParameters GetInputStreamParameters( 31 virtual AudioParameters GetInputStreamParameters(
32 const std::string& device_id) OVERRIDE; 32 const std::string& device_id) OVERRIDE;
33 33
34 virtual AudioOutputStream* MakeAudioOutputStream( 34 virtual AudioOutputStream* MakeAudioOutputStream(
35 const AudioParameters& params, 35 const AudioParameters& params,
36 const std::string& device_id, 36 const std::string& device_id) OVERRIDE;
37 const std::string& input_device_id) OVERRIDE;
38 virtual AudioInputStream* MakeAudioInputStream( 37 virtual AudioInputStream* MakeAudioInputStream(
39 const AudioParameters& params, 38 const AudioParameters& params,
40 const std::string& device_id) OVERRIDE; 39 const std::string& device_id) OVERRIDE;
41 virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE; 40 virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE;
42 virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE; 41 virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE;
43 42
44 // Implementation of AudioManagerBase. 43 // Implementation of AudioManagerBase.
45 virtual AudioOutputStream* MakeLinearOutputStream( 44 virtual AudioOutputStream* MakeLinearOutputStream(
46 const AudioParameters& params) OVERRIDE; 45 const AudioParameters& params) OVERRIDE;
47 virtual AudioOutputStream* MakeLowLatencyOutputStream( 46 virtual AudioOutputStream* MakeLowLatencyOutputStream(
48 const AudioParameters& params, 47 const AudioParameters& params,
49 const std::string& device_id, 48 const std::string& device_id) OVERRIDE;
50 const std::string& input_device_id) OVERRIDE;
51 virtual AudioInputStream* MakeLinearInputStream( 49 virtual AudioInputStream* MakeLinearInputStream(
52 const AudioParameters& params, 50 const AudioParameters& params,
53 const std::string& device_id) OVERRIDE; 51 const std::string& device_id) OVERRIDE;
54 virtual AudioInputStream* MakeLowLatencyInputStream( 52 virtual AudioInputStream* MakeLowLatencyInputStream(
55 const AudioParameters& params, 53 const AudioParameters& params,
56 const std::string& device_id) OVERRIDE; 54 const std::string& device_id) OVERRIDE;
57 55
58 static bool RegisterAudioManager(JNIEnv* env); 56 static bool RegisterAudioManager(JNIEnv* env);
59 57
60 void SetMute(JNIEnv* env, jobject obj, jboolean muted); 58 void SetMute(JNIEnv* env, jobject obj, jboolean muted);
(...skipping 30 matching lines...) Expand all
91 // AudioManager::MakeAudioOutputStream on the audio thread. For now, this 89 // AudioManager::MakeAudioOutputStream on the audio thread. For now, this
92 // lock is used to guard access to |streams_|. 90 // lock is used to guard access to |streams_|.
93 base::Lock streams_lock_; 91 base::Lock streams_lock_;
94 92
95 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid); 93 DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
96 }; 94 };
97 95
98 } // namespace media 96 } // namespace media
99 97
100 #endif // MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_ 98 #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