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

Side by Side Diff: webrtc/media/base/videocapturer.h

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/base/videoengine_unittest.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 /* 1 /*
2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 12 matching lines...) Expand all
23 #include "webrtc/media/base/videosourceinterface.h" 23 #include "webrtc/media/base/videosourceinterface.h"
24 #include "webrtc/base/rollingaccumulator.h" 24 #include "webrtc/base/rollingaccumulator.h"
25 #include "webrtc/base/sigslot.h" 25 #include "webrtc/base/sigslot.h"
26 #include "webrtc/base/timing.h" 26 #include "webrtc/base/timing.h"
27 #include "webrtc/base/thread_checker.h" 27 #include "webrtc/base/thread_checker.h"
28 #include "webrtc/media/base/mediachannel.h" 28 #include "webrtc/media/base/mediachannel.h"
29 #include "webrtc/media/base/videoadapter.h" 29 #include "webrtc/media/base/videoadapter.h"
30 #include "webrtc/media/base/videobroadcaster.h" 30 #include "webrtc/media/base/videobroadcaster.h"
31 #include "webrtc/media/base/videocommon.h" 31 #include "webrtc/media/base/videocommon.h"
32 #include "webrtc/media/base/videoframefactory.h" 32 #include "webrtc/media/base/videoframefactory.h"
33 #include "webrtc/media/devices/devicemanager.h"
34 33
35 34
36 namespace cricket { 35 namespace cricket {
37 36
38 // Current state of the capturer. 37 // Current state of the capturer.
39 enum CaptureState { 38 enum CaptureState {
40 CS_STOPPED, // The capturer has been stopped or hasn't started yet. 39 CS_STOPPED, // The capturer has been stopped or hasn't started yet.
41 CS_STARTING, // The capturer is in the process of starting. Note, it may 40 CS_STARTING, // The capturer is in the process of starting. Note, it may
42 // still fail to start. 41 // still fail to start.
43 CS_RUNNING, // The capturer has been started successfully and is now 42 CS_RUNNING, // The capturer has been started successfully and is now
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 337
339 // Whether capturer should apply rotation to the frame before signaling it. 338 // Whether capturer should apply rotation to the frame before signaling it.
340 bool apply_rotation_; 339 bool apply_rotation_;
341 340
342 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 341 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
343 }; 342 };
344 343
345 } // namespace cricket 344 } // namespace cricket
346 345
347 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 346 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/base/videoengine_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698