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 11 matching lines...) Expand all Loading... |
22 #include "webrtc/call/call.h" | 22 #include "webrtc/call/call.h" |
23 #include "webrtc/common_types.h" | 23 #include "webrtc/common_types.h" |
24 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" | 24 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" |
25 #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" | 25 #include "webrtc/modules/audio_coding/neteq/tools/fake_decode_from_file.h" |
26 #include "webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" | 26 #include "webrtc/modules/audio_coding/neteq/tools/neteq_delay_analyzer.h" |
27 #include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" | 27 #include "webrtc/modules/audio_coding/neteq/tools/neteq_replacement_input.h" |
28 #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" | 28 #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h" |
29 #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" | 29 #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" |
30 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" | 30 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" |
31 #include "webrtc/modules/include/module_common_types.h" | 31 #include "webrtc/modules/include/module_common_types.h" |
| 32 #include "webrtc/modules/pacing/paced_sender.h" |
32 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" | 33 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" |
33 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 34 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
34 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" | 35 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" |
35 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" | 36 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" |
36 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" | 37 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" |
37 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" | 38 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" |
38 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" | 39 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" |
39 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" | 40 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" |
40 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" | 41 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" |
41 #include "webrtc/rtc_base/checks.h" | 42 #include "webrtc/rtc_base/checks.h" |
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1123 for (const LoggedRtcpPacket& rtcp_packet : kv.second) | 1124 for (const LoggedRtcpPacket& rtcp_packet : kv.second) |
1124 incoming_rtcp.insert( | 1125 incoming_rtcp.insert( |
1125 std::make_pair(rtcp_packet.timestamp, &rtcp_packet)); | 1126 std::make_pair(rtcp_packet.timestamp, &rtcp_packet)); |
1126 } | 1127 } |
1127 } | 1128 } |
1128 | 1129 |
1129 SimulatedClock clock(0); | 1130 SimulatedClock clock(0); |
1130 BitrateObserver observer; | 1131 BitrateObserver observer; |
1131 RtcEventLogNullImpl null_event_log; | 1132 RtcEventLogNullImpl null_event_log; |
1132 PacketRouter packet_router; | 1133 PacketRouter packet_router; |
1133 CongestionController cc(&clock, &observer, &observer, &null_event_log, | 1134 PacedSender pacer(&clock, &packet_router, &null_event_log); |
1134 &packet_router); | 1135 SendSideCongestionController cc(&clock, &observer, &null_event_log, &pacer); |
1135 // TODO(holmer): Log the call config and use that here instead. | 1136 // TODO(holmer): Log the call config and use that here instead. |
1136 static const uint32_t kDefaultStartBitrateBps = 300000; | 1137 static const uint32_t kDefaultStartBitrateBps = 300000; |
1137 cc.SetBweBitrates(0, kDefaultStartBitrateBps, -1); | 1138 cc.SetBweBitrates(0, kDefaultStartBitrateBps, -1); |
1138 | 1139 |
1139 TimeSeries time_series("Delay-based estimate", LINE_DOT_GRAPH); | 1140 TimeSeries time_series("Delay-based estimate", LINE_DOT_GRAPH); |
1140 TimeSeries acked_time_series("Acked bitrate", LINE_DOT_GRAPH); | 1141 TimeSeries acked_time_series("Acked bitrate", LINE_DOT_GRAPH); |
1141 | 1142 |
1142 auto rtp_iterator = outgoing_rtp.begin(); | 1143 auto rtp_iterator = outgoing_rtp.begin(); |
1143 auto rtcp_iterator = incoming_rtcp.begin(); | 1144 auto rtcp_iterator = incoming_rtcp.begin(); |
1144 | 1145 |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1723 plot->AppendTimeSeries(std::move(series.second)); | 1724 plot->AppendTimeSeries(std::move(series.second)); |
1724 } | 1725 } |
1725 | 1726 |
1726 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); | 1727 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); |
1727 plot->SetYAxis(min_y_axis, max_y_axis, "Relative delay (ms)", kBottomMargin, | 1728 plot->SetYAxis(min_y_axis, max_y_axis, "Relative delay (ms)", kBottomMargin, |
1728 kTopMargin); | 1729 kTopMargin); |
1729 plot->SetTitle("NetEq timing"); | 1730 plot->SetTitle("NetEq timing"); |
1730 } | 1731 } |
1731 } // namespace plotting | 1732 } // namespace plotting |
1732 } // namespace webrtc | 1733 } // namespace webrtc |
OLD | NEW |