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

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, 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
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 13 matching lines...) Expand all
24 #include "webrtc/base/rollingaccumulator.h" 24 #include "webrtc/base/rollingaccumulator.h"
25 #include "webrtc/base/scoped_ptr.h" 25 #include "webrtc/base/scoped_ptr.h"
26 #include "webrtc/base/sigslot.h" 26 #include "webrtc/base/sigslot.h"
27 #include "webrtc/base/thread.h" 27 #include "webrtc/base/thread.h"
28 #include "webrtc/base/timing.h" 28 #include "webrtc/base/timing.h"
29 #include "webrtc/media/base/mediachannel.h" 29 #include "webrtc/media/base/mediachannel.h"
30 #include "webrtc/media/base/videoadapter.h" 30 #include "webrtc/media/base/videoadapter.h"
31 #include "webrtc/media/base/videobroadcaster.h" 31 #include "webrtc/media/base/videobroadcaster.h"
32 #include "webrtc/media/base/videocommon.h" 32 #include "webrtc/media/base/videocommon.h"
33 #include "webrtc/media/base/videoframefactory.h" 33 #include "webrtc/media/base/videoframefactory.h"
34 #include "webrtc/media/devices/devicemanager.h"
35 34
36 35
37 namespace cricket { 36 namespace cricket {
38 37
39 // Current state of the capturer. 38 // Current state of the capturer.
40 // TODO(hellner): CS_NO_DEVICE is an error code not a capture state. Separate 39 // TODO(hellner): CS_NO_DEVICE is an error code not a capture state. Separate
41 // error codes and states. 40 // error codes and states.
42 enum CaptureState { 41 enum CaptureState {
43 CS_STOPPED, // The capturer has been stopped or hasn't started yet. 42 CS_STOPPED, // The capturer has been stopped or hasn't started yet.
44 CS_STARTING, // The capturer is in the process of starting. Note, it may 43 CS_STARTING, // The capturer is in the process of starting. Note, it may
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 372
374 // Whether capturer should apply rotation to the frame before signaling it. 373 // Whether capturer should apply rotation to the frame before signaling it.
375 bool apply_rotation_; 374 bool apply_rotation_;
376 375
377 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 376 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
378 }; 377 };
379 378
380 } // namespace cricket 379 } // namespace cricket
381 380
382 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 381 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698