| OLD | NEW |
| 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 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1403 | 1403 |
| 1404 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { | 1404 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { |
| 1405 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); | 1405 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); |
| 1406 call_->SignalChannelNetworkState( | 1406 call_->SignalChannelNetworkState( |
| 1407 webrtc::MediaType::VIDEO, | 1407 webrtc::MediaType::VIDEO, |
| 1408 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); | 1408 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); |
| 1409 } | 1409 } |
| 1410 | 1410 |
| 1411 void WebRtcVideoChannel2::OnNetworkRouteChanged( | 1411 void WebRtcVideoChannel2::OnNetworkRouteChanged( |
| 1412 const std::string& transport_name, | 1412 const std::string& transport_name, |
| 1413 const NetworkRoute& network_route) { | 1413 const rtc::NetworkRoute& network_route) { |
| 1414 // TODO(honghaiz): uncomment this once the function in call is implemented. | 1414 call_->OnNetworkRouteChanged(transport_name, network_route); |
| 1415 // call_->OnNetworkRouteChanged(transport_name, network_route); | |
| 1416 } | 1415 } |
| 1417 | 1416 |
| 1418 // TODO(pbos): Remove SetOptions in favor of SetSendParameters. | 1417 // TODO(pbos): Remove SetOptions in favor of SetSendParameters. |
| 1419 void WebRtcVideoChannel2::SetOptions(uint32_t ssrc, | 1418 void WebRtcVideoChannel2::SetOptions(uint32_t ssrc, |
| 1420 const VideoOptions& options) { | 1419 const VideoOptions& options) { |
| 1421 LOG(LS_INFO) << "SetOptions: ssrc " << ssrc << ": " << options.ToString(); | 1420 LOG(LS_INFO) << "SetOptions: ssrc " << ssrc << ": " << options.ToString(); |
| 1422 | 1421 |
| 1423 rtc::CritScope stream_lock(&stream_crit_); | 1422 rtc::CritScope stream_lock(&stream_crit_); |
| 1424 const auto& kv = send_streams_.find(ssrc); | 1423 const auto& kv = send_streams_.find(ssrc); |
| 1425 if (kv == send_streams_.end()) { | 1424 if (kv == send_streams_.end()) { |
| (...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2566 rtx_mapping[video_codecs[i].codec.id] != | 2565 rtx_mapping[video_codecs[i].codec.id] != |
| 2567 fec_settings.red_payload_type) { | 2566 fec_settings.red_payload_type) { |
| 2568 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2567 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2569 } | 2568 } |
| 2570 } | 2569 } |
| 2571 | 2570 |
| 2572 return video_codecs; | 2571 return video_codecs; |
| 2573 } | 2572 } |
| 2574 | 2573 |
| 2575 } // namespace cricket | 2574 } // namespace cricket |
| OLD | NEW |