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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 0) { | 125 0) { |
126 return false; | 126 return false; |
127 } | 127 } |
128 } | 128 } |
129 // Return recovered packets through callback. | 129 // Return recovered packets through callback. |
130 for (const auto& recovered_packet : recovered_packets_) { | 130 for (const auto& recovered_packet : recovered_packets_) { |
131 if (recovered_packet->returned) { | 131 if (recovered_packet->returned) { |
132 continue; | 132 continue; |
133 } | 133 } |
134 ++packet_counter_.num_recovered_packets; | 134 ++packet_counter_.num_recovered_packets; |
135 // Set this flag first, since OnRecoveredPacket may end up here | |
brandtr
2017/05/16 08:19:39
I'll look into why this is the case.
| |
136 // again, with the same packet. | |
137 recovered_packet->returned = true; | |
135 recovered_packet_receiver_->OnRecoveredPacket( | 138 recovered_packet_receiver_->OnRecoveredPacket( |
136 recovered_packet->pkt->data, recovered_packet->pkt->length); | 139 recovered_packet->pkt->data, recovered_packet->pkt->length); |
137 recovered_packet->returned = true; | |
138 // Periodically log the incoming packets. | 140 // Periodically log the incoming packets. |
139 int64_t now_ms = clock_->TimeInMilliseconds(); | 141 int64_t now_ms = clock_->TimeInMilliseconds(); |
140 if (now_ms - last_recovered_packet_ms_ > kPacketLogIntervalMs) { | 142 if (now_ms - last_recovered_packet_ms_ > kPacketLogIntervalMs) { |
141 uint32_t media_ssrc = | 143 uint32_t media_ssrc = |
142 ForwardErrorCorrection::ParseSsrc(recovered_packet->pkt->data); | 144 ForwardErrorCorrection::ParseSsrc(recovered_packet->pkt->data); |
143 LOG(LS_VERBOSE) << "Recovered media packet with SSRC: " << media_ssrc | 145 LOG(LS_VERBOSE) << "Recovered media packet with SSRC: " << media_ssrc |
144 << " from FlexFEC stream with SSRC: " << ssrc_ << "."; | 146 << " from FlexFEC stream with SSRC: " << ssrc_ << "."; |
145 last_recovered_packet_ms_ = now_ms; | 147 last_recovered_packet_ms_ = now_ms; |
146 } | 148 } |
147 } | 149 } |
148 return true; | 150 return true; |
149 } | 151 } |
150 | 152 |
151 } // namespace webrtc | 153 } // namespace webrtc |
OLD | NEW |