OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 1000000; | 1063 1000000; |
1064 acked_time_series.points.emplace_back(x, y); | 1064 acked_time_series.points.emplace_back(x, y); |
1065 } | 1065 } |
1066 ++rtcp_iterator; | 1066 ++rtcp_iterator; |
1067 } | 1067 } |
1068 if (clock.TimeInMicroseconds() >= NextRtpTime()) { | 1068 if (clock.TimeInMicroseconds() >= NextRtpTime()) { |
1069 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextRtpTime()); | 1069 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextRtpTime()); |
1070 const LoggedRtpPacket& rtp = *rtp_iterator->second; | 1070 const LoggedRtpPacket& rtp = *rtp_iterator->second; |
1071 if (rtp.header.extension.hasTransportSequenceNumber) { | 1071 if (rtp.header.extension.hasTransportSequenceNumber) { |
1072 RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber); | 1072 RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber); |
1073 cc.AddPacket(rtp.header.extension.transportSequenceNumber, | 1073 cc.AddPacket(rtp.header.ssrc, |
| 1074 rtp.header.extension.transportSequenceNumber, |
1074 rtp.total_length, PacedPacketInfo()); | 1075 rtp.total_length, PacedPacketInfo()); |
1075 rtc::SentPacket sent_packet( | 1076 rtc::SentPacket sent_packet( |
1076 rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000); | 1077 rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000); |
1077 cc.OnSentPacket(sent_packet); | 1078 cc.OnSentPacket(sent_packet); |
1078 } | 1079 } |
1079 ++rtp_iterator; | 1080 ++rtp_iterator; |
1080 } | 1081 } |
1081 if (clock.TimeInMicroseconds() >= NextProcessTime()) { | 1082 if (clock.TimeInMicroseconds() >= NextProcessTime()) { |
1082 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextProcessTime()); | 1083 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextProcessTime()); |
1083 cc.Process(); | 1084 cc.Process(); |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1162 time_series.points.emplace_back(x, y); | 1163 time_series.points.emplace_back(x, y); |
1163 } | 1164 } |
1164 } | 1165 } |
1165 ++rtcp_iterator; | 1166 ++rtcp_iterator; |
1166 } | 1167 } |
1167 if (clock.TimeInMicroseconds() >= NextRtpTime()) { | 1168 if (clock.TimeInMicroseconds() >= NextRtpTime()) { |
1168 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextRtpTime()); | 1169 RTC_DCHECK_EQ(clock.TimeInMicroseconds(), NextRtpTime()); |
1169 const LoggedRtpPacket& rtp = *rtp_iterator->second; | 1170 const LoggedRtpPacket& rtp = *rtp_iterator->second; |
1170 if (rtp.header.extension.hasTransportSequenceNumber) { | 1171 if (rtp.header.extension.hasTransportSequenceNumber) { |
1171 RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber); | 1172 RTC_DCHECK(rtp.header.extension.hasTransportSequenceNumber); |
1172 feedback_adapter.AddPacket(rtp.header.extension.transportSequenceNumber, | 1173 feedback_adapter.AddPacket(rtp.header.ssrc, |
| 1174 rtp.header.extension.transportSequenceNumber, |
1173 rtp.total_length, PacedPacketInfo()); | 1175 rtp.total_length, PacedPacketInfo()); |
1174 feedback_adapter.OnSentPacket( | 1176 feedback_adapter.OnSentPacket( |
1175 rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000); | 1177 rtp.header.extension.transportSequenceNumber, rtp.timestamp / 1000); |
1176 } | 1178 } |
1177 ++rtp_iterator; | 1179 ++rtp_iterator; |
1178 } | 1180 } |
1179 time_us = std::min(NextRtpTime(), NextRtcpTime()); | 1181 time_us = std::min(NextRtpTime(), NextRtcpTime()); |
1180 } | 1182 } |
1181 // We assume that the base network delay (w/o queues) is the min delay | 1183 // We assume that the base network delay (w/o queues) is the min delay |
1182 // observed during the call. | 1184 // observed during the call. |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1351 return rtc::Optional<float>(); | 1353 return rtc::Optional<float>(); |
1352 }, | 1354 }, |
1353 audio_network_adaptation_events_, begin_time_, time_series); | 1355 audio_network_adaptation_events_, begin_time_, time_series); |
1354 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); | 1356 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); |
1355 plot->SetSuggestedYAxis(0, 1, "Number of channels (1 (mono)/2 (stereo))", | 1357 plot->SetSuggestedYAxis(0, 1, "Number of channels (1 (mono)/2 (stereo))", |
1356 kBottomMargin, kTopMargin); | 1358 kBottomMargin, kTopMargin); |
1357 plot->SetTitle("Reported audio encoder number of channels"); | 1359 plot->SetTitle("Reported audio encoder number of channels"); |
1358 } | 1360 } |
1359 } // namespace plotting | 1361 } // namespace plotting |
1360 } // namespace webrtc | 1362 } // namespace webrtc |
OLD | NEW |