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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 has_received_ack_ = true; | 92 has_received_ack_ = true; |
93 } | 93 } |
94 } | 94 } |
95 | 95 |
96 void FullBweSender::OnPacketsSent(const Packets& packets) { | 96 void FullBweSender::OnPacketsSent(const Packets& packets) { |
97 for (Packet* packet : packets) { | 97 for (Packet* packet : packets) { |
98 if (packet->GetPacketType() == Packet::kMedia) { | 98 if (packet->GetPacketType() == Packet::kMedia) { |
99 MediaPacket* media_packet = static_cast<MediaPacket*>(packet); | 99 MediaPacket* media_packet = static_cast<MediaPacket*>(packet); |
100 // TODO(philipel): Add probe_cluster_id to Packet class in order | 100 // TODO(philipel): Add probe_cluster_id to Packet class in order |
101 // to create tests for probing using cluster ids. | 101 // to create tests for probing using cluster ids. |
102 send_time_history_.AddAndRemoveOld(media_packet->header().sequenceNumber, | 102 send_time_history_.AddAndRemoveOld( |
103 media_packet->payload_size(), | 103 media_packet->header().sequenceNumber, media_packet->payload_size(), |
104 PacketInfo::kNotAProbe); | 104 packet->paced(), PacketInfo::kNotAProbe); |
105 send_time_history_.OnSentPacket(media_packet->header().sequenceNumber, | 105 send_time_history_.OnSentPacket(media_packet->header().sequenceNumber, |
106 media_packet->sender_timestamp_ms()); | 106 media_packet->sender_timestamp_ms()); |
107 } | 107 } |
108 } | 108 } |
109 } | 109 } |
110 | 110 |
111 void FullBweSender::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs, | 111 void FullBweSender::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs, |
112 uint32_t bitrate) { | 112 uint32_t bitrate) { |
113 feedback_observer_->OnReceivedEstimatedBitrate(bitrate); | 113 feedback_observer_->OnReceivedEstimatedBitrate(bitrate); |
114 } | 114 } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 packet_feedback_vector_.back().arrival_time_ms; | 148 packet_feedback_vector_.back().arrival_time_ms; |
149 FeedbackPacket* fb = new SendSideBweFeedback( | 149 FeedbackPacket* fb = new SendSideBweFeedback( |
150 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); | 150 flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_); |
151 packet_feedback_vector_.clear(); | 151 packet_feedback_vector_.clear(); |
152 return fb; | 152 return fb; |
153 } | 153 } |
154 | 154 |
155 } // namespace bwe | 155 } // namespace bwe |
156 } // namespace testing | 156 } // namespace testing |
157 } // namespace webrtc | 157 } // namespace webrtc |
OLD | NEW |