OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 | 22 |
23 FecReceiver* FecReceiver::Create(RtpData* callback) { | 23 FecReceiver* FecReceiver::Create(RtpData* callback) { |
24 return new FecReceiverImpl(callback); | 24 return new FecReceiverImpl(callback); |
25 } | 25 } |
26 | 26 |
27 FecReceiverImpl::FecReceiverImpl(RtpData* callback) | 27 FecReceiverImpl::FecReceiverImpl(RtpData* callback) |
28 : recovered_packet_callback_(callback), | 28 : recovered_packet_callback_(callback), |
29 fec_(new ForwardErrorCorrection()) {} | 29 fec_(new ForwardErrorCorrection()) {} |
30 | 30 |
31 FecReceiverImpl::~FecReceiverImpl() { | 31 FecReceiverImpl::~FecReceiverImpl() { |
32 while (!received_packet_list_.empty()) { | 32 received_packet_list_.clear(); |
33 delete received_packet_list_.front(); | |
34 received_packet_list_.pop_front(); | |
35 } | |
36 if (fec_ != NULL) { | 33 if (fec_ != NULL) { |
37 fec_->ResetState(&recovered_packet_list_); | 34 fec_->ResetState(&recovered_packet_list_); |
38 delete fec_; | 35 delete fec_; |
39 } | 36 } |
40 } | 37 } |
41 | 38 |
42 FecPacketCounter FecReceiverImpl::GetPacketCounter() const { | 39 FecPacketCounter FecReceiverImpl::GetPacketCounter() const { |
43 rtc::CritScope cs(&crit_sect_); | 40 rtc::CritScope cs(&crit_sect_); |
44 return packet_counter_; | 41 return packet_counter_; |
45 } | 42 } |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 payload_data_length - REDHeaderLength); | 199 payload_data_length - REDHeaderLength); |
203 | 200 |
204 received_packet->pkt->length = | 201 received_packet->pkt->length = |
205 header.headerLength + payload_data_length - REDHeaderLength; | 202 header.headerLength + payload_data_length - REDHeaderLength; |
206 } | 203 } |
207 | 204 |
208 if (received_packet->pkt->length == 0) { | 205 if (received_packet->pkt->length == 0) { |
209 return 0; | 206 return 0; |
210 } | 207 } |
211 | 208 |
212 received_packet_list_.push_back(received_packet.release()); | 209 received_packet_list_.push_back(std::move(received_packet)); |
213 if (second_received_packet) { | 210 if (second_received_packet) { |
214 received_packet_list_.push_back(second_received_packet.release()); | 211 received_packet_list_.push_back(std::move(second_received_packet)); |
215 } | 212 } |
216 return 0; | 213 return 0; |
217 } | 214 } |
218 | 215 |
219 int32_t FecReceiverImpl::ProcessReceivedFec() { | 216 int32_t FecReceiverImpl::ProcessReceivedFec() { |
220 crit_sect_.Enter(); | 217 crit_sect_.Enter(); |
221 if (!received_packet_list_.empty()) { | 218 if (!received_packet_list_.empty()) { |
222 // Send received media packet to VCM. | 219 // Send received media packet to VCM. |
223 if (!received_packet_list_.front()->is_fec) { | 220 if (!received_packet_list_.front()->is_fec) { |
224 ForwardErrorCorrection::Packet* packet = | 221 ForwardErrorCorrection::Packet* packet = |
225 received_packet_list_.front()->pkt; | 222 received_packet_list_.front()->pkt; |
226 crit_sect_.Leave(); | 223 crit_sect_.Leave(); |
227 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, | 224 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, |
228 packet->length)) { | 225 packet->length)) { |
229 return -1; | 226 return -1; |
230 } | 227 } |
231 crit_sect_.Enter(); | 228 crit_sect_.Enter(); |
232 } | 229 } |
233 if (fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_) != 0) { | 230 if (fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_) != 0) { |
234 crit_sect_.Leave(); | 231 crit_sect_.Leave(); |
235 return -1; | 232 return -1; |
236 } | 233 } |
237 RTC_DCHECK(received_packet_list_.empty()); | 234 RTC_DCHECK(received_packet_list_.empty()); |
238 } | 235 } |
239 // Send any recovered media packets to VCM. | 236 // Send any recovered media packets to VCM. |
240 for(auto* recovered_packet : recovered_packet_list_) { | 237 for(auto& recovered_packet : recovered_packet_list_) { |
stefan-webrtc
2016/07/05 08:51:38
for (const auto&
brandtr
2016/07/05 10:28:00
Done.
| |
241 if (recovered_packet->returned) { | 238 if (recovered_packet->returned) { |
242 // Already sent to the VCM and the jitter buffer. | 239 // Already sent to the VCM and the jitter buffer. |
243 continue; | 240 continue; |
244 } | 241 } |
245 ForwardErrorCorrection::Packet* packet = recovered_packet->pkt; | 242 ForwardErrorCorrection::Packet* packet = recovered_packet->pkt; |
246 ++packet_counter_.num_recovered_packets; | 243 ++packet_counter_.num_recovered_packets; |
247 crit_sect_.Leave(); | 244 crit_sect_.Leave(); |
248 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, | 245 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, |
249 packet->length)) { | 246 packet->length)) { |
250 return -1; | 247 return -1; |
251 } | 248 } |
252 crit_sect_.Enter(); | 249 crit_sect_.Enter(); |
253 recovered_packet->returned = true; | 250 recovered_packet->returned = true; |
254 } | 251 } |
255 crit_sect_.Leave(); | 252 crit_sect_.Leave(); |
256 return 0; | 253 return 0; |
257 } | 254 } |
258 | 255 |
259 } // namespace webrtc | 256 } // namespace webrtc |
OLD | NEW |