| 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 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 return; | 1354 return; |
| 1355 } | 1355 } |
| 1356 if (!video_channel_->SetVideoSend(ssrc, enable, options)) { | 1356 if (!video_channel_->SetVideoSend(ssrc, enable, options)) { |
| 1357 // Allow that MuteStream fail if |enable| is false but assert otherwise. | 1357 // Allow that MuteStream fail if |enable| is false but assert otherwise. |
| 1358 // This in the normal case when the underlying media channel has already | 1358 // This in the normal case when the underlying media channel has already |
| 1359 // been deleted. | 1359 // been deleted. |
| 1360 ASSERT(enable == false); | 1360 ASSERT(enable == false); |
| 1361 } | 1361 } |
| 1362 } | 1362 } |
| 1363 | 1363 |
| 1364 rtc::VideoSinkInterface<cricket::VideoFrame>* WebRtcSession::GetSink( |
| 1365 uint32_t ssrc) { |
| 1366 ASSERT(signaling_thread()->IsCurrent()); |
| 1367 if (!video_channel_) { |
| 1368 LOG(LS_WARNING) << "GetSink: No video channel exists."; |
| 1369 return NULL; |
| 1370 } |
| 1371 return video_channel_->GetSink(ssrc); |
| 1372 } |
| 1373 |
| 1364 bool WebRtcSession::CanInsertDtmf(const std::string& track_id) { | 1374 bool WebRtcSession::CanInsertDtmf(const std::string& track_id) { |
| 1365 ASSERT(signaling_thread()->IsCurrent()); | 1375 ASSERT(signaling_thread()->IsCurrent()); |
| 1366 if (!voice_channel_) { | 1376 if (!voice_channel_) { |
| 1367 LOG(LS_ERROR) << "CanInsertDtmf: No audio channel exists."; | 1377 LOG(LS_ERROR) << "CanInsertDtmf: No audio channel exists."; |
| 1368 return false; | 1378 return false; |
| 1369 } | 1379 } |
| 1370 uint32_t send_ssrc = 0; | 1380 uint32_t send_ssrc = 0; |
| 1371 // The Dtmf is negotiated per channel not ssrc, so we only check if the ssrc | 1381 // The Dtmf is negotiated per channel not ssrc, so we only check if the ssrc |
| 1372 // exists. | 1382 // exists. |
| 1373 if (!local_desc_ || | 1383 if (!local_desc_ || |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2176 } | 2186 } |
| 2177 } | 2187 } |
| 2178 | 2188 |
| 2179 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2189 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
| 2180 const rtc::SentPacket& sent_packet) { | 2190 const rtc::SentPacket& sent_packet) { |
| 2181 RTC_DCHECK(worker_thread()->IsCurrent()); | 2191 RTC_DCHECK(worker_thread()->IsCurrent()); |
| 2182 media_controller_->call_w()->OnSentPacket(sent_packet); | 2192 media_controller_->call_w()->OnSentPacket(sent_packet); |
| 2183 } | 2193 } |
| 2184 | 2194 |
| 2185 } // namespace webrtc | 2195 } // namespace webrtc |
| OLD | NEW |