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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1844773002: Update the call when the network route changes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Remove the change in congestion controller. Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { 1406 void WebRtcVideoChannel2::OnReadyToSend(bool ready) {
1407 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); 1407 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready.");
1408 call_->SignalChannelNetworkState( 1408 call_->SignalChannelNetworkState(
1409 webrtc::MediaType::VIDEO, 1409 webrtc::MediaType::VIDEO,
1410 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); 1410 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown);
1411 } 1411 }
1412 1412
1413 void WebRtcVideoChannel2::OnNetworkRouteChanged( 1413 void WebRtcVideoChannel2::OnNetworkRouteChanged(
1414 const std::string& transport_name, 1414 const std::string& transport_name,
1415 const NetworkRoute& network_route) { 1415 const NetworkRoute& network_route) {
1416 // TODO(honghaiz): uncomment this once the function in call is implemented. 1416 call_->OnNetworkRouteChanged(transport_name, network_route);
1417 // call_->OnNetworkRouteChanged(transport_name, network_route);
1418 } 1417 }
1419 1418
1420 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { 1419 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) {
1421 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " 1420 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> "
1422 << (mute ? "mute" : "unmute"); 1421 << (mute ? "mute" : "unmute");
1423 RTC_DCHECK(ssrc != 0); 1422 RTC_DCHECK(ssrc != 0);
1424 rtc::CritScope stream_lock(&stream_crit_); 1423 rtc::CritScope stream_lock(&stream_crit_);
1425 const auto& kv = send_streams_.find(ssrc); 1424 const auto& kv = send_streams_.find(ssrc);
1426 if (kv == send_streams_.end()) { 1425 if (kv == send_streams_.end()) {
1427 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; 1426 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
(...skipping 1165 matching lines...) Expand 10 before | Expand all | Expand 10 after
2593 rtx_mapping[video_codecs[i].codec.id] != 2592 rtx_mapping[video_codecs[i].codec.id] !=
2594 fec_settings.red_payload_type) { 2593 fec_settings.red_payload_type) {
2595 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2594 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2596 } 2595 }
2597 } 2596 }
2598 2597
2599 return video_codecs; 2598 return video_codecs;
2600 } 2599 }
2601 2600
2602 } // namespace cricket 2601 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698