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 1403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1414 // filter RTCP anymore incoming RTCP packets could've been going to audio (so | 1414 // filter RTCP anymore incoming RTCP packets could've been going to audio (so |
1415 // logging failures spam the log). | 1415 // logging failures spam the log). |
1416 call_->Receiver()->DeliverPacket( | 1416 call_->Receiver()->DeliverPacket( |
1417 webrtc::MediaType::VIDEO, | 1417 webrtc::MediaType::VIDEO, |
1418 packet->cdata(), packet->size(), | 1418 packet->cdata(), packet->size(), |
1419 webrtc_packet_time); | 1419 webrtc_packet_time); |
1420 } | 1420 } |
1421 | 1421 |
1422 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { | 1422 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { |
1423 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); | 1423 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); |
1424 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); | 1424 call_->SignalChannelNetworkState( |
| 1425 webrtc::MediaType::VIDEO, |
| 1426 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); |
1425 } | 1427 } |
1426 | 1428 |
1427 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { | 1429 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { |
1428 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " | 1430 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " |
1429 << (mute ? "mute" : "unmute"); | 1431 << (mute ? "mute" : "unmute"); |
1430 RTC_DCHECK(ssrc != 0); | 1432 RTC_DCHECK(ssrc != 0); |
1431 rtc::CritScope stream_lock(&stream_crit_); | 1433 rtc::CritScope stream_lock(&stream_crit_); |
1432 const auto& kv = send_streams_.find(ssrc); | 1434 const auto& kv = send_streams_.find(ssrc); |
1433 if (kv == send_streams_.end()) { | 1435 if (kv == send_streams_.end()) { |
1434 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; | 1436 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2613 rtx_mapping[video_codecs[i].codec.id] != | 2615 rtx_mapping[video_codecs[i].codec.id] != |
2614 fec_settings.red_payload_type) { | 2616 fec_settings.red_payload_type) { |
2615 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2617 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2616 } | 2618 } |
2617 } | 2619 } |
2618 | 2620 |
2619 return video_codecs; | 2621 return video_codecs; |
2620 } | 2622 } |
2621 | 2623 |
2622 } // namespace cricket | 2624 } // namespace cricket |
OLD | NEW |