OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1421 const rtc::PacketTime& packet_time) { | 1421 const rtc::PacketTime& packet_time) { |
1422 if (call_->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, | 1422 if (call_->Receiver()->DeliverPacket(webrtc::MediaType::VIDEO, |
1423 reinterpret_cast<const uint8_t*>(packet->data()), packet->size()) != | 1423 reinterpret_cast<const uint8_t*>(packet->data()), packet->size()) != |
1424 webrtc::PacketReceiver::DELIVERY_OK) { | 1424 webrtc::PacketReceiver::DELIVERY_OK) { |
1425 LOG(LS_WARNING) << "Failed to deliver RTCP packet."; | 1425 LOG(LS_WARNING) << "Failed to deliver RTCP packet."; |
1426 } | 1426 } |
1427 } | 1427 } |
1428 | 1428 |
1429 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { | 1429 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { |
1430 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); | 1430 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); |
1431 call_->SignalNetworkState(ready ? webrtc::Call::kNetworkUp | 1431 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); |
1432 : webrtc::Call::kNetworkDown); | |
1433 } | 1432 } |
1434 | 1433 |
1435 bool WebRtcVideoChannel2::MuteStream(uint32 ssrc, bool mute) { | 1434 bool WebRtcVideoChannel2::MuteStream(uint32 ssrc, bool mute) { |
1436 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " | 1435 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " |
1437 << (mute ? "mute" : "unmute"); | 1436 << (mute ? "mute" : "unmute"); |
1438 DCHECK(ssrc != 0); | 1437 DCHECK(ssrc != 0); |
1439 rtc::CritScope stream_lock(&stream_crit_); | 1438 rtc::CritScope stream_lock(&stream_crit_); |
1440 if (send_streams_.find(ssrc) == send_streams_.end()) { | 1439 if (send_streams_.find(ssrc) == send_streams_.end()) { |
1441 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; | 1440 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; |
1442 return false; | 1441 return false; |
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2610 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2609 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2611 } | 2610 } |
2612 } | 2611 } |
2613 | 2612 |
2614 return video_codecs; | 2613 return video_codecs; |
2615 } | 2614 } |
2616 | 2615 |
2617 } // namespace cricket | 2616 } // namespace cricket |
2618 | 2617 |
2619 #endif // HAVE_WEBRTC_VIDEO | 2618 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |