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

Side by Side Diff: webrtc/api/videosource.cc

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last 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
« no previous file with comments | « webrtc/api/statscollector_unittest.cc ('k') | webrtc/api/videosource_unittest.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 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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
11 #include "webrtc/api/videosource.h" 11 #include "webrtc/api/videosource.h"
12 12
13 #include <cstdlib> 13 #include <cstdlib>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/api/mediaconstraintsinterface.h" 16 #include "webrtc/api/mediaconstraintsinterface.h"
17 #include "talk/session/media/channelmanager.h"
18 #include "webrtc/base/arraysize.h" 17 #include "webrtc/base/arraysize.h"
18 #include "webrtc/pc/channelmanager.h"
19 19
20 using cricket::CaptureState; 20 using cricket::CaptureState;
21 using webrtc::MediaConstraintsInterface; 21 using webrtc::MediaConstraintsInterface;
22 using webrtc::MediaSourceInterface; 22 using webrtc::MediaSourceInterface;
23 23
24 namespace { 24 namespace {
25 25
26 const double kRoundingTruncation = 0.0005; 26 const double kRoundingTruncation = 0.0005;
27 27
28 enum { 28 enum {
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 void VideoSource::SetState(SourceState new_state) { 412 void VideoSource::SetState(SourceState new_state) {
413 // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776. 413 // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776.
414 // if (VERIFY(state_ != new_state)) { 414 // if (VERIFY(state_ != new_state)) {
415 if (state_ != new_state) { 415 if (state_ != new_state) {
416 state_ = new_state; 416 state_ = new_state;
417 FireOnChanged(); 417 FireOnChanged();
418 } 418 }
419 } 419 }
420 420
421 } // namespace webrtc 421 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/statscollector_unittest.cc ('k') | webrtc/api/videosource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698