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

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

Issue 1832793002: More cleanup of cricket::VideoCapturer Remove unused state CS_PAUSED Remove unused SignalVideoFrame (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 | « no previous file | webrtc/media/base/videocapturer.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 MediaSourceInterface::SourceState GetReadyState(cricket::CaptureState state) { 43 MediaSourceInterface::SourceState GetReadyState(cricket::CaptureState state) {
44 switch (state) { 44 switch (state) {
45 case cricket::CS_STARTING: 45 case cricket::CS_STARTING:
46 return MediaSourceInterface::kInitializing; 46 return MediaSourceInterface::kInitializing;
47 case cricket::CS_RUNNING: 47 case cricket::CS_RUNNING:
48 return MediaSourceInterface::kLive; 48 return MediaSourceInterface::kLive;
49 case cricket::CS_FAILED: 49 case cricket::CS_FAILED:
50 case cricket::CS_STOPPED: 50 case cricket::CS_STOPPED:
51 return MediaSourceInterface::kEnded; 51 return MediaSourceInterface::kEnded;
52 case cricket::CS_PAUSED:
53 return MediaSourceInterface::kMuted;
nisse-webrtc 2016/03/24 09:55:01 Is appears to be the last use of kMuted? Can you d
perkj_webrtc 2016/03/24 10:05:31 Looks like it. Prefer separate cl since it will to
54 default: 52 default:
55 ASSERT(false && "GetReadyState unknown state"); 53 ASSERT(false && "GetReadyState unknown state");
56 } 54 }
57 return MediaSourceInterface::kEnded; 55 return MediaSourceInterface::kEnded;
58 } 56 }
59 57
60 void SetUpperLimit(int new_limit, int* original_limit) { 58 void SetUpperLimit(int new_limit, int* original_limit) {
61 if (*original_limit < 0 || new_limit < *original_limit) 59 if (*original_limit < 0 || new_limit < *original_limit)
62 *original_limit = new_limit; 60 *original_limit = new_limit;
63 } 61 }
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 this, capturer, capture_state)); 392 this, capturer, capture_state));
395 return; 393 return;
396 } 394 }
397 395
398 if (capturer == video_capturer_.get()) { 396 if (capturer == video_capturer_.get()) {
399 SetState(GetReadyState(capture_state)); 397 SetState(GetReadyState(capture_state));
400 } 398 }
401 } 399 }
402 400
403 } // namespace webrtc 401 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698