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

Side by Side Diff: talk/app/webrtc/videosource.cc

Issue 1461513003: Temporarily disable VERIFY while bug is investigated. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 1 month 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 | no next file » | 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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 // This signal is triggered for all video capturers. Not only the one we are 455 // This signal is triggered for all video capturers. Not only the one we are
456 // interested in. 456 // interested in.
457 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer, 457 void VideoSource::OnStateChange(cricket::VideoCapturer* capturer,
458 cricket::CaptureState capture_state) { 458 cricket::CaptureState capture_state) {
459 if (capturer == video_capturer_.get()) { 459 if (capturer == video_capturer_.get()) {
460 SetState(GetReadyState(capture_state)); 460 SetState(GetReadyState(capture_state));
461 } 461 }
462 } 462 }
463 463
464 void VideoSource::SetState(SourceState new_state) { 464 void VideoSource::SetState(SourceState new_state) {
465 if (VERIFY(state_ != new_state)) { 465 // TODO(phoglund): Temporarily disabled VERIFY due to issue 4776.
perkj_webrtc 2015/11/18 15:12:20 TODO(hbos) ? webrtc:4776
phoglund 2015/11/18 15:27:27 Done.
hbos 2015/11/18 15:29:13 Yeah, assign it to me.
466 // if (VERIFY(state_ != new_state)) {
467 if (state_ != new_state) {
466 state_ = new_state; 468 state_ = new_state;
467 FireOnChanged(); 469 FireOnChanged();
468 } 470 }
469 } 471 }
470 472
471 } // namespace webrtc 473 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698