| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1383 return; | 1383 return; |
| 1384 } | 1384 } |
| 1385 if (!video_channel_->SetVideoSend(ssrc, enable, options)) { | 1385 if (!video_channel_->SetVideoSend(ssrc, enable, options)) { |
| 1386 // Allow that MuteStream fail if |enable| is false but assert otherwise. | 1386 // Allow that MuteStream fail if |enable| is false but assert otherwise. |
| 1387 // This in the normal case when the underlying media channel has already | 1387 // This in the normal case when the underlying media channel has already |
| 1388 // been deleted. | 1388 // been deleted. |
| 1389 ASSERT(enable == false); | 1389 ASSERT(enable == false); |
| 1390 } | 1390 } |
| 1391 } | 1391 } |
| 1392 | 1392 |
| 1393 rtc::VideoSinkInterface<cricket::VideoFrame>* WebRtcSession::GetSink( |
| 1394 uint32_t ssrc) { |
| 1395 ASSERT(signaling_thread()->IsCurrent()); |
| 1396 if (!video_channel_) { |
| 1397 LOG(LS_WARNING) << "GetSink: No video channel exists."; |
| 1398 return NULL; |
| 1399 } |
| 1400 return video_channel_->GetSink(ssrc); |
| 1401 } |
| 1402 |
| 1393 bool WebRtcSession::CanInsertDtmf(const std::string& track_id) { | 1403 bool WebRtcSession::CanInsertDtmf(const std::string& track_id) { |
| 1394 ASSERT(signaling_thread()->IsCurrent()); | 1404 ASSERT(signaling_thread()->IsCurrent()); |
| 1395 if (!voice_channel_) { | 1405 if (!voice_channel_) { |
| 1396 LOG(LS_ERROR) << "CanInsertDtmf: No audio channel exists."; | 1406 LOG(LS_ERROR) << "CanInsertDtmf: No audio channel exists."; |
| 1397 return false; | 1407 return false; |
| 1398 } | 1408 } |
| 1399 uint32_t send_ssrc = 0; | 1409 uint32_t send_ssrc = 0; |
| 1400 // The Dtmf is negotiated per channel not ssrc, so we only check if the ssrc | 1410 // The Dtmf is negotiated per channel not ssrc, so we only check if the ssrc |
| 1401 // exists. | 1411 // exists. |
| 1402 if (!local_desc_ || | 1412 if (!local_desc_ || |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2205 } | 2215 } |
| 2206 } | 2216 } |
| 2207 | 2217 |
| 2208 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2218 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
| 2209 const rtc::SentPacket& sent_packet) { | 2219 const rtc::SentPacket& sent_packet) { |
| 2210 RTC_DCHECK(worker_thread()->IsCurrent()); | 2220 RTC_DCHECK(worker_thread()->IsCurrent()); |
| 2211 media_controller_->call_w()->OnSentPacket(sent_packet); | 2221 media_controller_->call_w()->OnSentPacket(sent_packet); |
| 2212 } | 2222 } |
| 2213 | 2223 |
| 2214 } // namespace webrtc | 2224 } // namespace webrtc |
| OLD | NEW |