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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
311 } | 311 } |
312 | 312 |
313 // TODO(pbos): Handle media and RTX streams separately (separate RTCP | 313 // TODO(pbos): Handle media and RTX streams separately (separate RTCP |
314 // feedbacks). | 314 // feedbacks). |
315 RTCPSender::FeedbackState ModuleRtpRtcpImpl::GetFeedbackState() { | 315 RTCPSender::FeedbackState ModuleRtpRtcpImpl::GetFeedbackState() { |
316 StreamDataCounters rtp_stats; | 316 StreamDataCounters rtp_stats; |
317 StreamDataCounters rtx_stats; | 317 StreamDataCounters rtx_stats; |
318 rtp_sender_.GetDataCounters(&rtp_stats, &rtx_stats); | 318 rtp_sender_.GetDataCounters(&rtp_stats, &rtx_stats); |
319 | 319 |
320 RTCPSender::FeedbackState state; | 320 RTCPSender::FeedbackState state; |
321 state.send_payload_type = rtp_sender_.SendPayloadType(); | |
danilchap
2017/03/17 09:43:15
may be delete RtpSender::SendPayloadType/SetSendPa
danilchap
2017/03/17 09:45:29
sorry, SetSendPayloadType actually still used, bet
| |
322 state.packets_sent = rtp_stats.transmitted.packets + | 321 state.packets_sent = rtp_stats.transmitted.packets + |
323 rtx_stats.transmitted.packets; | 322 rtx_stats.transmitted.packets; |
324 state.media_bytes_sent = rtp_stats.transmitted.payload_bytes + | 323 state.media_bytes_sent = rtp_stats.transmitted.payload_bytes + |
325 rtx_stats.transmitted.payload_bytes; | 324 rtx_stats.transmitted.payload_bytes; |
326 state.module = this; | 325 state.module = this; |
327 | 326 |
328 LastReceivedNTP(&state.last_rr_ntp_secs, | 327 LastReceivedNTP(&state.last_rr_ntp_secs, |
329 &state.last_rr_ntp_frac, | 328 &state.last_rr_ntp_frac, |
330 &state.remote_sr); | 329 &state.remote_sr); |
331 | 330 |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
865 StreamDataCountersCallback* | 864 StreamDataCountersCallback* |
866 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { | 865 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { |
867 return rtp_sender_.GetRtpStatisticsCallback(); | 866 return rtp_sender_.GetRtpStatisticsCallback(); |
868 } | 867 } |
869 | 868 |
870 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( | 869 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( |
871 const BitrateAllocation& bitrate) { | 870 const BitrateAllocation& bitrate) { |
872 rtcp_sender_.SetVideoBitrateAllocation(bitrate); | 871 rtcp_sender_.SetVideoBitrateAllocation(bitrate); |
873 } | 872 } |
874 } // namespace webrtc | 873 } // namespace webrtc |
OLD | NEW |