| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 private: | 108 private: |
| 109 int64_t latest_send_time_ms_; // Time stamp for the latest sent FbPacket. | 109 int64_t latest_send_time_ms_; // Time stamp for the latest sent FbPacket. |
| 110 }; | 110 }; |
| 111 | 111 |
| 112 class BbrBweFeedback : public FeedbackPacket { | 112 class BbrBweFeedback : public FeedbackPacket { |
| 113 public: | 113 public: |
| 114 BbrBweFeedback(int flow_id, | 114 BbrBweFeedback(int flow_id, |
| 115 int64_t send_time_us, | 115 int64_t send_time_us, |
| 116 int64_t latest_send_time_ms, | 116 int64_t latest_send_time_ms, |
| 117 const std::vector<uint64_t>& packet_feedback_vector); | 117 const std::vector<uint16_t>& packet_feedback_vector); |
| 118 virtual ~BbrBweFeedback() {} | 118 virtual ~BbrBweFeedback() {} |
| 119 | 119 |
| 120 const std::vector<uint64_t>& packet_feedback_vector() const { | 120 const std::vector<uint16_t>& packet_feedback_vector() const { |
| 121 return packet_feedback_vector_; | 121 return packet_feedback_vector_; |
| 122 } | 122 } |
| 123 | 123 |
| 124 private: | 124 private: |
| 125 const std::vector<uint64_t> packet_feedback_vector_; | 125 const std::vector<uint16_t> packet_feedback_vector_; |
| 126 }; | 126 }; |
| 127 | 127 |
| 128 class RembFeedback : public FeedbackPacket { | 128 class RembFeedback : public FeedbackPacket { |
| 129 public: | 129 public: |
| 130 RembFeedback(int flow_id, | 130 RembFeedback(int flow_id, |
| 131 int64_t send_time_us, | 131 int64_t send_time_us, |
| 132 int64_t latest_send_time_ms, | 132 int64_t latest_send_time_ms, |
| 133 uint32_t estimated_bps, | 133 uint32_t estimated_bps, |
| 134 RTCPReportBlock report_block); | 134 RTCPReportBlock report_block); |
| 135 virtual ~RembFeedback() {} | 135 virtual ~RembFeedback() {} |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 }; | 211 }; |
| 212 | 212 |
| 213 typedef std::list<Packet*> Packets; | 213 typedef std::list<Packet*> Packets; |
| 214 typedef std::list<Packet*>::iterator PacketsIt; | 214 typedef std::list<Packet*>::iterator PacketsIt; |
| 215 typedef std::list<Packet*>::const_iterator PacketsConstIt; | 215 typedef std::list<Packet*>::const_iterator PacketsConstIt; |
| 216 | 216 |
| 217 } // namespace bwe | 217 } // namespace bwe |
| 218 } // namespace testing | 218 } // namespace testing |
| 219 } // namespace webrtc | 219 } // namespace webrtc |
| 220 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ | 220 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_ |
| OLD | NEW |