| 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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  863 void ModuleRtpRtcpImpl::OnRequestSendReport() { |  863 void ModuleRtpRtcpImpl::OnRequestSendReport() { | 
|  864   SendRTCP(kRtcpSr); |  864   SendRTCP(kRtcpSr); | 
|  865 } |  865 } | 
|  866  |  866  | 
|  867 int32_t ModuleRtpRtcpImpl::SendRTCPReferencePictureSelection( |  867 int32_t ModuleRtpRtcpImpl::SendRTCPReferencePictureSelection( | 
|  868     const uint64_t picture_id) { |  868     const uint64_t picture_id) { | 
|  869   return rtcp_sender_.SendRTCP( |  869   return rtcp_sender_.SendRTCP( | 
|  870       GetFeedbackState(), kRtcpRpsi, 0, 0, false, picture_id); |  870       GetFeedbackState(), kRtcpRpsi, 0, 0, false, picture_id); | 
|  871 } |  871 } | 
|  872  |  872  | 
|  873 void ModuleRtpRtcpImpl::OnReceivedNACK( |  873 void ModuleRtpRtcpImpl::OnReceivedNack( | 
|  874     const std::list<uint16_t>& nack_sequence_numbers) { |  874     const std::vector<uint16_t>& nack_sequence_numbers) { | 
|  875   for (uint16_t nack_sequence_number : nack_sequence_numbers) { |  875   for (uint16_t nack_sequence_number : nack_sequence_numbers) { | 
|  876     send_loss_stats_.AddLostPacket(nack_sequence_number); |  876     send_loss_stats_.AddLostPacket(nack_sequence_number); | 
|  877   } |  877   } | 
|  878   if (!rtp_sender_.StorePackets() || |  878   if (!rtp_sender_.StorePackets() || | 
|  879       nack_sequence_numbers.size() == 0) { |  879       nack_sequence_numbers.size() == 0) { | 
|  880     return; |  880     return; | 
|  881   } |  881   } | 
|  882   // Use RTT from RtcpRttStats class if provided. |  882   // Use RTT from RtcpRttStats class if provided. | 
|  883   int64_t rtt = rtt_ms(); |  883   int64_t rtt = rtt_ms(); | 
|  884   if (rtt == 0) { |  884   if (rtt == 0) { | 
|  885     rtcp_receiver_.RTT(rtcp_receiver_.RemoteSSRC(), NULL, &rtt, NULL, NULL); |  885     rtcp_receiver_.RTT(rtcp_receiver_.RemoteSSRC(), NULL, &rtt, NULL, NULL); | 
|  886   } |  886   } | 
|  887   rtp_sender_.OnReceivedNACK(nack_sequence_numbers, rtt); |  887   rtp_sender_.OnReceivedNack(nack_sequence_numbers, rtt); | 
|  888 } |  888 } | 
|  889  |  889  | 
|  890 void ModuleRtpRtcpImpl::OnReceivedRtcpReportBlocks( |  890 void ModuleRtpRtcpImpl::OnReceivedRtcpReportBlocks( | 
|  891     const ReportBlockList& report_blocks) { |  891     const ReportBlockList& report_blocks) { | 
|  892   rtp_sender_.OnReceivedRtcpReportBlocks(report_blocks); |  892   rtp_sender_.OnReceivedRtcpReportBlocks(report_blocks); | 
|  893 } |  893 } | 
|  894  |  894  | 
|  895 bool ModuleRtpRtcpImpl::LastReceivedNTP( |  895 bool ModuleRtpRtcpImpl::LastReceivedNTP( | 
|  896     uint32_t* rtcp_arrival_time_secs,  // When we got the last report. |  896     uint32_t* rtcp_arrival_time_secs,  // When we got the last report. | 
|  897     uint32_t* rtcp_arrival_time_frac, |  897     uint32_t* rtcp_arrival_time_frac, | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  956 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( |  956 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( | 
|  957     StreamDataCountersCallback* callback) { |  957     StreamDataCountersCallback* callback) { | 
|  958   rtp_sender_.RegisterRtpStatisticsCallback(callback); |  958   rtp_sender_.RegisterRtpStatisticsCallback(callback); | 
|  959 } |  959 } | 
|  960  |  960  | 
|  961 StreamDataCountersCallback* |  961 StreamDataCountersCallback* | 
|  962     ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { |  962     ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { | 
|  963   return rtp_sender_.GetRtpStatisticsCallback(); |  963   return rtp_sender_.GetRtpStatisticsCallback(); | 
|  964 } |  964 } | 
|  965 }  // namespace webrtc |  965 }  // namespace webrtc | 
| OLD | NEW |