| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 RTCPReportBlock report_block() const { return report_block_; } | 121 RTCPReportBlock report_block() const { return report_block_; } |
| 122 | 122 |
| 123 private: | 123 private: |
| 124 const uint32_t estimated_bps_; | 124 const uint32_t estimated_bps_; |
| 125 const RTCPReportBlock report_block_; | 125 const RTCPReportBlock report_block_; |
| 126 }; | 126 }; |
| 127 | 127 |
| 128 class SendSideBweFeedback : public FeedbackPacket { | 128 class SendSideBweFeedback : public FeedbackPacket { |
| 129 public: | 129 public: |
| 130 typedef std::map<uint16_t, int64_t> ArrivalTimesMap; | 130 typedef std::map<uint16_t, int64_t> ArrivalTimesMap; |
| 131 SendSideBweFeedback(int flow_id, | 131 SendSideBweFeedback( |
| 132 int64_t send_time_us, | 132 int flow_id, |
| 133 int64_t latest_send_time_ms, | 133 int64_t send_time_us, |
| 134 const std::vector<PacketInfo>& packet_feedback_vector); | 134 int64_t latest_send_time_ms, |
| 135 const std::vector<PacketFeedback>& packet_feedback_vector); |
| 135 virtual ~SendSideBweFeedback() {} | 136 virtual ~SendSideBweFeedback() {} |
| 136 | 137 |
| 137 const std::vector<PacketInfo>& packet_feedback_vector() const { | 138 const std::vector<PacketFeedback>& packet_feedback_vector() const { |
| 138 return packet_feedback_vector_; | 139 return packet_feedback_vector_; |
| 139 } | 140 } |
| 140 | 141 |
| 141 private: | 142 private: |
| 142 const std::vector<PacketInfo> packet_feedback_vector_; | 143 const std::vector<PacketFeedback> packet_feedback_vector_; |
| 143 }; | 144 }; |
| 144 | 145 |
| 145 class NadaFeedback : public FeedbackPacket { | 146 class NadaFeedback : public FeedbackPacket { |
| 146 public: | 147 public: |
| 147 NadaFeedback(int flow_id, | 148 NadaFeedback(int flow_id, |
| 148 int64_t this_send_time_us, | 149 int64_t this_send_time_us, |
| 149 int64_t exp_smoothed_delay_ms, | 150 int64_t exp_smoothed_delay_ms, |
| 150 int64_t est_queuing_delay_signal_ms, | 151 int64_t est_queuing_delay_signal_ms, |
| 151 int64_t congestion_signal, | 152 int64_t congestion_signal, |
| 152 float derivative, | 153 float derivative, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 }; | 194 }; |
| 194 | 195 |
| 195 typedef std::list<Packet*> Packets; | 196 typedef std::list<Packet*> Packets; |
| 196 typedef std::list<Packet*>::iterator PacketsIt; | 197 typedef std::list<Packet*>::iterator PacketsIt; |
| 197 typedef std::list<Packet*>::const_iterator PacketsConstIt; | 198 typedef std::list<Packet*>::const_iterator PacketsConstIt; |
| 198 | 199 |
| 199 } // namespace bwe | 200 } // namespace bwe |
| 200 } // namespace testing | 201 } // namespace testing |
| 201 } // namespace webrtc | 202 } // namespace webrtc |
| 202 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ | 203 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ |
| OLD | NEW |