OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 } | 377 } |
378 | 378 |
379 void ModuleRtpRtcpImpl::SetSendingMediaStatus(const bool sending) { | 379 void ModuleRtpRtcpImpl::SetSendingMediaStatus(const bool sending) { |
380 rtp_sender_.SetSendingMediaStatus(sending); | 380 rtp_sender_.SetSendingMediaStatus(sending); |
381 } | 381 } |
382 | 382 |
383 bool ModuleRtpRtcpImpl::SendingMedia() const { | 383 bool ModuleRtpRtcpImpl::SendingMedia() const { |
384 return rtp_sender_.SendingMedia(); | 384 return rtp_sender_.SendingMedia(); |
385 } | 385 } |
386 | 386 |
387 int32_t ModuleRtpRtcpImpl::SendOutgoingData( | 387 bool ModuleRtpRtcpImpl::SendOutgoingData( |
388 FrameType frame_type, | 388 FrameType frame_type, |
389 int8_t payload_type, | 389 int8_t payload_type, |
390 uint32_t time_stamp, | 390 uint32_t time_stamp, |
391 int64_t capture_time_ms, | 391 int64_t capture_time_ms, |
392 const uint8_t* payload_data, | 392 const uint8_t* payload_data, |
393 size_t payload_size, | 393 size_t payload_size, |
394 const RTPFragmentationHeader* fragmentation, | 394 const RTPFragmentationHeader* fragmentation, |
395 const RTPVideoHeader* rtp_video_header) { | 395 const RTPVideoHeader* rtp_video_header, |
| 396 uint32_t* transport_frame_id_out) { |
396 rtcp_sender_.SetLastRtpTime(time_stamp, capture_time_ms); | 397 rtcp_sender_.SetLastRtpTime(time_stamp, capture_time_ms); |
397 // Make sure an RTCP report isn't queued behind a key frame. | 398 // Make sure an RTCP report isn't queued behind a key frame. |
398 if (rtcp_sender_.TimeToSendRTCPReport(kVideoFrameKey == frame_type)) { | 399 if (rtcp_sender_.TimeToSendRTCPReport(kVideoFrameKey == frame_type)) { |
399 rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport); | 400 rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport); |
400 } | 401 } |
401 return rtp_sender_.SendOutgoingData( | 402 return rtp_sender_.SendOutgoingData( |
402 frame_type, payload_type, time_stamp, capture_time_ms, payload_data, | 403 frame_type, payload_type, time_stamp, capture_time_ms, payload_data, |
403 payload_size, fragmentation, rtp_video_header); | 404 payload_size, fragmentation, rtp_video_header, transport_frame_id_out); |
404 } | 405 } |
405 | 406 |
406 bool ModuleRtpRtcpImpl::TimeToSendPacket(uint32_t ssrc, | 407 bool ModuleRtpRtcpImpl::TimeToSendPacket(uint32_t ssrc, |
407 uint16_t sequence_number, | 408 uint16_t sequence_number, |
408 int64_t capture_time_ms, | 409 int64_t capture_time_ms, |
409 bool retransmission, | 410 bool retransmission, |
410 int probe_cluster_id) { | 411 int probe_cluster_id) { |
411 if (SendingMedia() && ssrc == rtp_sender_.SSRC()) { | 412 if (SendingMedia() && ssrc == rtp_sender_.SSRC()) { |
412 return rtp_sender_.TimeToSendPacket(sequence_number, capture_time_ms, | 413 return rtp_sender_.TimeToSendPacket(sequence_number, capture_time_ms, |
413 retransmission, probe_cluster_id); | 414 retransmission, probe_cluster_id); |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
968 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( | 969 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( |
969 StreamDataCountersCallback* callback) { | 970 StreamDataCountersCallback* callback) { |
970 rtp_sender_.RegisterRtpStatisticsCallback(callback); | 971 rtp_sender_.RegisterRtpStatisticsCallback(callback); |
971 } | 972 } |
972 | 973 |
973 StreamDataCountersCallback* | 974 StreamDataCountersCallback* |
974 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { | 975 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { |
975 return rtp_sender_.GetRtpStatisticsCallback(); | 976 return rtp_sender_.GetRtpStatisticsCallback(); |
976 } | 977 } |
977 } // namespace webrtc | 978 } // namespace webrtc |
OLD | NEW |