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

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

Issue 29423003: Added video capture capabilities retrieval and caching to VideoCaptureManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed mechanics of Caps enumeration to be asynchronous and 2 threaded. UT adapted. Created 7 years, 1 month 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 // 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 MediaStreamUIController for permission to 9 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
10 // use devices and for which device to use. 10 // use devices and for which device to use.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Implements MediaStreamProviderListener. 137 // Implements MediaStreamProviderListener.
138 virtual void Opened(MediaStreamType stream_type, 138 virtual void Opened(MediaStreamType stream_type,
139 int capture_session_id) OVERRIDE; 139 int capture_session_id) OVERRIDE;
140 virtual void Closed(MediaStreamType stream_type, 140 virtual void Closed(MediaStreamType stream_type,
141 int capture_session_id) OVERRIDE; 141 int capture_session_id) OVERRIDE;
142 virtual void DevicesEnumerated(MediaStreamType stream_type, 142 virtual void DevicesEnumerated(MediaStreamType stream_type,
143 const StreamDeviceInfoArray& devices) OVERRIDE; 143 const StreamDeviceInfoArray& devices) OVERRIDE;
144 virtual void Error(MediaStreamType stream_type, 144 virtual void Error(MediaStreamType stream_type,
145 int capture_session_id, 145 int capture_session_id,
146 MediaStreamProviderError error) OVERRIDE; 146 MediaStreamProviderError error) OVERRIDE;
147 virtual void DeviceCapabilitiesEnumerated(
148 const StreamDeviceInfo& device_info,
149 const media::VideoCaptureCapabilities& capabilities) OVERRIDE;
147 150
148 // Implements base::SystemMonitor::DevicesChangedObserver. 151 // Implements base::SystemMonitor::DevicesChangedObserver.
149 virtual void OnDevicesChanged( 152 virtual void OnDevicesChanged(
150 base::SystemMonitor::DeviceType device_type) OVERRIDE; 153 base::SystemMonitor::DeviceType device_type) OVERRIDE;
151 154
152 // Used by unit test to make sure fake devices are used instead of a real 155 // Used by unit test to make sure fake devices are used instead of a real
153 // devices, which is needed for server based testing or certain tests (which 156 // devices, which is needed for server based testing or certain tests (which
154 // can pass --use-fake-device-for-media-stream). 157 // can pass --use-fake-device-for-media-stream).
155 void UseFakeDevice(); 158 void UseFakeDevice();
156 159
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 280
278 bool use_fake_ui_; 281 bool use_fake_ui_;
279 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_; 282 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_;
280 283
281 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager); 284 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
282 }; 285 };
283 286
284 } // namespace content 287 } // namespace content
285 288
286 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_ 289 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698