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

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

Issue 1740963002: Revert of Removed unused cricket::VideoCapturer methods (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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/api/test/fakeperiodicvideocapturer.h ('k') | webrtc/media/base/capturemanager.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 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
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 }; 48 };
49 49
50 MediaSourceInterface::SourceState 50 MediaSourceInterface::SourceState
51 GetReadyState(cricket::CaptureState state) { 51 GetReadyState(cricket::CaptureState state) {
52 switch (state) { 52 switch (state) {
53 case cricket::CS_STARTING: 53 case cricket::CS_STARTING:
54 return MediaSourceInterface::kInitializing; 54 return MediaSourceInterface::kInitializing;
55 case cricket::CS_RUNNING: 55 case cricket::CS_RUNNING:
56 return MediaSourceInterface::kLive; 56 return MediaSourceInterface::kLive;
57 case cricket::CS_FAILED: 57 case cricket::CS_FAILED:
58 case cricket::CS_NO_DEVICE:
58 case cricket::CS_STOPPED: 59 case cricket::CS_STOPPED:
59 return MediaSourceInterface::kEnded; 60 return MediaSourceInterface::kEnded;
60 case cricket::CS_PAUSED: 61 case cricket::CS_PAUSED:
61 return MediaSourceInterface::kMuted; 62 return MediaSourceInterface::kMuted;
62 default: 63 default:
63 ASSERT(false && "GetReadyState unknown state"); 64 ASSERT(false && "GetReadyState unknown state");
64 } 65 }
65 return MediaSourceInterface::kEnded; 66 return MediaSourceInterface::kEnded;
66 } 67 }
67 68
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 void VideoSource::RemoveSink( 396 void VideoSource::RemoveSink(
396 rtc::VideoSinkInterface<cricket::VideoFrame>* output) { 397 rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
397 sinks_.remove(output); 398 sinks_.remove(output);
398 channel_manager_->RemoveVideoSink(video_capturer_.get(), output); 399 channel_manager_->RemoveVideoSink(video_capturer_.get(), output);
399 } 400 }
400 401
401 // OnStateChange listens to the ChannelManager::SignalVideoCaptureStateChange. 402 // OnStateChange listens to the ChannelManager::SignalVideoCaptureStateChange.
402 // This signal is triggered for all video capturers. Not only the one we are 403 // This signal is triggered for all video capturers. Not only the one we are
403 // interested in. 404 // interested in.
404 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer, 405 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer,
405 cricket::CaptureState capture_state) { 406 cricket::CaptureState capture_state) {
406 if (capturer == video_capturer_.get()) { 407 if (capturer == video_capturer_.get()) {
407 SetState(GetReadyState(capture_state)); 408 SetState(GetReadyState(capture_state));
408 } 409 }
409 } 410 }
410 411
411 void VideoSource::SetState(SourceState new_state) { 412 void VideoSource::SetState(SourceState new_state) {
412 // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776. 413 // TODO(hbos): Temporarily disabled VERIFY due to webrtc:4776.
413 // if (VERIFY(state_ != new_state)) { 414 // if (VERIFY(state_ != new_state)) {
414 if (state_ != new_state) { 415 if (state_ != new_state) {
415 state_ = new_state; 416 state_ = new_state;
416 FireOnChanged(); 417 FireOnChanged();
417 } 418 }
418 } 419 }
419 420
420 } // namespace webrtc 421 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/test/fakeperiodicvideocapturer.h ('k') | webrtc/media/base/capturemanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698