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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.h

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 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 | Annotate | Revision Log
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 // MediaStreamManager is used to open/enumerate media capture devices (video 5 // MediaStreamManager is used to open/enumerate media capture devices (video
6 // supported now). Call flow: 6 // supported now). Call flow:
7 // 1. GenerateStream is called when a render process wants to use a capture 7 // 1. GenerateStream is called when a render process wants to use a capture
8 // device. 8 // device.
9 // 2. MediaStreamManager will ask MediaStreamDeviceSettings for permission to 9 // 2. MediaStreamManager will ask MediaStreamDeviceSettings for permission to
10 // use devices and for which device to use. 10 // use devices and for which device to use.
(...skipping 17 matching lines...) Expand all
28 28
29 #include "base/basictypes.h" 29 #include "base/basictypes.h"
30 #include "base/memory/scoped_ptr.h" 30 #include "base/memory/scoped_ptr.h"
31 #include "base/memory/ref_counted.h" 31 #include "base/memory/ref_counted.h"
32 #include "base/supports_user_data.h" 32 #include "base/supports_user_data.h"
33 #include "content/browser/renderer_host/media/media_stream_provider.h" 33 #include "content/browser/renderer_host/media/media_stream_provider.h"
34 #include "content/browser/renderer_host/media/media_stream_settings_requester.h" 34 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
35 #include "content/common/media/media_stream_options.h" 35 #include "content/common/media/media_stream_options.h"
36 #include "content/common/content_export.h" 36 #include "content/common/content_export.h"
37 37
38 class AudioManager;
39
40 namespace content { 38 namespace content {
41 class ResourceContext; 39 class ResourceContext;
42 } 40 }
43 41
42 namespace media {
43 class AudioManager;
44 }
45
44 namespace media_stream { 46 namespace media_stream {
45 47
46 class AudioInputDeviceManager; 48 class AudioInputDeviceManager;
47 class MediaStreamDeviceSettings; 49 class MediaStreamDeviceSettings;
48 class MediaStreamRequester; 50 class MediaStreamRequester;
49 class VideoCaptureManager; 51 class VideoCaptureManager;
50 52
51 // MediaStreamManager is used to generate and close new media devices, not to 53 // MediaStreamManager is used to generate and close new media devices, not to
52 // start the media flow. 54 // start the media flow.
53 // The classes requesting new media streams are answered using 55 // The classes requesting new media streams are answered using
54 // MediaStreamManager::Listener. 56 // MediaStreamManager::Listener.
55 class CONTENT_EXPORT MediaStreamManager 57 class CONTENT_EXPORT MediaStreamManager
56 : public MediaStreamProviderListener, 58 : public MediaStreamProviderListener,
57 public SettingsRequester, 59 public SettingsRequester,
58 public base::SupportsUserData::Data { 60 public base::SupportsUserData::Data {
59 public: 61 public:
60 // Returns the MediaStreamManager for the given ResourceContext. If it hasn't 62 // Returns the MediaStreamManager for the given ResourceContext. If it hasn't
61 // been created yet, it will be constructed with the given AudioManager. 63 // been created yet, it will be constructed with the given AudioManager.
62 static MediaStreamManager* GetForResourceContext( 64 static MediaStreamManager* GetForResourceContext(
63 content::ResourceContext* resource_context, 65 content::ResourceContext* resource_context,
64 AudioManager* audio_manager); 66 media::AudioManager* audio_manager);
65 67
66 explicit MediaStreamManager(AudioManager* audio_manager); 68 explicit MediaStreamManager(media::AudioManager* audio_manager);
67 virtual ~MediaStreamManager(); 69 virtual ~MediaStreamManager();
68 70
69 // Used to access VideoCaptureManager. 71 // Used to access VideoCaptureManager.
70 VideoCaptureManager* video_capture_manager(); 72 VideoCaptureManager* video_capture_manager();
71 73
72 // Used to access AudioInputDeviceManager. 74 // Used to access AudioInputDeviceManager.
73 AudioInputDeviceManager* audio_input_device_manager(); 75 AudioInputDeviceManager* audio_input_device_manager();
74 76
75 // GenerateStream opens new media devices according to |components|. The 77 // GenerateStream opens new media devices according to |components|. The
76 // request is identified using |label|, which is pointing to an already 78 // request is identified using |label|, which is pointing to an already
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 scoped_refptr<VideoCaptureManager> video_capture_manager_; 146 scoped_refptr<VideoCaptureManager> video_capture_manager_;
145 scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_; 147 scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
146 148
147 // Keeps track of device types currently being enumerated to not enumerate 149 // Keeps track of device types currently being enumerated to not enumerate
148 // when not necessary. 150 // when not necessary.
149 std::vector<bool> enumeration_in_progress_; 151 std::vector<bool> enumeration_in_progress_;
150 152
151 // All non-closed request. 153 // All non-closed request.
152 typedef std::map<std::string, DeviceRequest> DeviceRequests; 154 typedef std::map<std::string, DeviceRequest> DeviceRequests;
153 DeviceRequests requests_; 155 DeviceRequests requests_;
154 AudioManager* audio_manager_; 156 media::AudioManager* audio_manager_;
155 157
156 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager); 158 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
157 }; 159 };
158 160
159 } // namespace media_stream 161 } // namespace media_stream
160 162
161 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_ 163 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698