Chromium Code Reviews| 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 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1353 // filter RTCP anymore incoming RTCP packets could've been going to audio (so | 1353 // filter RTCP anymore incoming RTCP packets could've been going to audio (so |
| 1354 // logging failures spam the log). | 1354 // logging failures spam the log). |
| 1355 call_->Receiver()->DeliverPacket( | 1355 call_->Receiver()->DeliverPacket( |
| 1356 webrtc::MediaType::VIDEO, | 1356 webrtc::MediaType::VIDEO, |
| 1357 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(), | 1357 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(), |
| 1358 webrtc_packet_time); | 1358 webrtc_packet_time); |
| 1359 } | 1359 } |
| 1360 | 1360 |
| 1361 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { | 1361 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { |
| 1362 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); | 1362 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); |
| 1363 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); | 1363 call_->SignalChannelNetworkState( |
| 1364 webrtc::MediaType::VIDEO, | |
|
the sun
2016/03/07 14:16:43
nit: indent, plus make a single line of the ternar
skvlad
2016/03/07 19:20:56
Done.
| |
| 1365 ready ? | |
| 1366 webrtc::kNetworkUp : webrtc::kNetworkDown); | |
| 1364 } | 1367 } |
| 1365 | 1368 |
| 1366 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { | 1369 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { |
| 1367 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " | 1370 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " |
| 1368 << (mute ? "mute" : "unmute"); | 1371 << (mute ? "mute" : "unmute"); |
| 1369 RTC_DCHECK(ssrc != 0); | 1372 RTC_DCHECK(ssrc != 0); |
| 1370 rtc::CritScope stream_lock(&stream_crit_); | 1373 rtc::CritScope stream_lock(&stream_crit_); |
| 1371 const auto& kv = send_streams_.find(ssrc); | 1374 const auto& kv = send_streams_.find(ssrc); |
| 1372 if (kv == send_streams_.end()) { | 1375 if (kv == send_streams_.end()) { |
| 1373 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; | 1376 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; |
| (...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2534 rtx_mapping[video_codecs[i].codec.id] != | 2537 rtx_mapping[video_codecs[i].codec.id] != |
| 2535 fec_settings.red_payload_type) { | 2538 fec_settings.red_payload_type) { |
| 2536 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2539 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2537 } | 2540 } |
| 2538 } | 2541 } |
| 2539 | 2542 |
| 2540 return video_codecs; | 2543 return video_codecs; |
| 2541 } | 2544 } |
| 2542 | 2545 |
| 2543 } // namespace cricket | 2546 } // namespace cricket |
| OLD | NEW |