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

Side by Side Diff: webrtc/pc/peerconnection.cc

Issue 2732663004: Rename OnIceConnectionChange to OnIceConnectionStateChange for consistency with the WebRTC 1.0 stan… (Closed)
Patch Set: Created 3 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/pc/peerconnection.h ('k') | webrtc/pc/webrtcsession.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 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 auto it = FindReceiverForTrack(track_id); 1647 auto it = FindReceiverForTrack(track_id);
1648 if (it == receivers_.end()) { 1648 if (it == receivers_.end()) {
1649 LOG(LS_WARNING) << "RtpReceiver for track with id " << track_id 1649 LOG(LS_WARNING) << "RtpReceiver for track with id " << track_id
1650 << " doesn't exist."; 1650 << " doesn't exist.";
1651 } else { 1651 } else {
1652 (*it)->internal()->Stop(); 1652 (*it)->internal()->Stop();
1653 receivers_.erase(it); 1653 receivers_.erase(it);
1654 } 1654 }
1655 } 1655 }
1656 1656
1657 void PeerConnection::OnIceConnectionChange( 1657 void PeerConnection::OnIceConnectionStateChange(
1658 PeerConnectionInterface::IceConnectionState new_state) { 1658 PeerConnectionInterface::IceConnectionState new_state) {
1659 RTC_DCHECK(signaling_thread()->IsCurrent()); 1659 RTC_DCHECK(signaling_thread()->IsCurrent());
1660 // After transitioning to "closed", ignore any additional states from 1660 // After transitioning to "closed", ignore any additional states from
1661 // WebRtcSession (such as "disconnected"). 1661 // WebRtcSession (such as "disconnected").
1662 if (IsClosed()) { 1662 if (IsClosed()) {
1663 return; 1663 return;
1664 } 1664 }
1665 ice_connection_state_ = new_state; 1665 ice_connection_state_ = new_state;
1666 observer_->OnIceConnectionChange(ice_connection_state_); 1666 observer_->OnIceConnectionChange(ice_connection_state_);
1667 } 1667 }
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 } 2561 }
2562 return event_log_->StartLogging(file, max_size_bytes); 2562 return event_log_->StartLogging(file, max_size_bytes);
2563 } 2563 }
2564 2564
2565 void PeerConnection::StopRtcEventLog_w() { 2565 void PeerConnection::StopRtcEventLog_w() {
2566 if (event_log_) { 2566 if (event_log_) {
2567 event_log_->StopLogging(); 2567 event_log_->StopLogging();
2568 } 2568 }
2569 } 2569 }
2570 } // namespace webrtc 2570 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnection.h ('k') | webrtc/pc/webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698