Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc

Issue 2099243003: Use std::unique_ptr in ForwardErrorCorrection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@flexfec-pt1a_mini-fixes-in-ULPFEC
Patch Set: Final nit from danilchap. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
11 #include "webrtc/modules/rtp_rtcp/source/fec_receiver_impl.h" 11 #include "webrtc/modules/rtp_rtcp/source/fec_receiver_impl.h"
12 12
13 #include <memory> 13 #include <memory>
14 #include <utility>
14 15
15 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
16 #include "webrtc/base/logging.h" 17 #include "webrtc/base/logging.h"
17 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 18 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" 19 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"
19 20
20 // RFC 5109 21 // RFC 5109
21 namespace webrtc { 22 namespace webrtc {
22 23
23 FecReceiver* FecReceiver::Create(RtpData* callback) { 24 FecReceiver* FecReceiver::Create(RtpData* callback) {
24 return new FecReceiverImpl(callback); 25 return new FecReceiverImpl(callback);
25 } 26 }
26 27
27 FecReceiverImpl::FecReceiverImpl(RtpData* callback) 28 FecReceiverImpl::FecReceiverImpl(RtpData* callback)
28 : recovered_packet_callback_(callback), 29 : recovered_packet_callback_(callback),
29 fec_(new ForwardErrorCorrection()) {} 30 fec_(new ForwardErrorCorrection()) {}
30 31
31 FecReceiverImpl::~FecReceiverImpl() { 32 FecReceiverImpl::~FecReceiverImpl() {
32 while (!received_packet_list_.empty()) { 33 received_packet_list_.clear();
33 delete received_packet_list_.front();
34 received_packet_list_.pop_front();
35 }
36 if (fec_ != NULL) { 34 if (fec_ != NULL) {
37 fec_->ResetState(&recovered_packet_list_); 35 fec_->ResetState(&recovered_packet_list_);
38 delete fec_; 36 delete fec_;
39 } 37 }
40 } 38 }
41 39
42 FecPacketCounter FecReceiverImpl::GetPacketCounter() const { 40 FecPacketCounter FecReceiverImpl::GetPacketCounter() const {
43 rtc::CritScope cs(&crit_sect_); 41 rtc::CritScope cs(&crit_sect_);
44 return packet_counter_; 42 return packet_counter_;
45 } 43 }
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 payload_data_length - REDHeaderLength); 200 payload_data_length - REDHeaderLength);
203 201
204 received_packet->pkt->length = 202 received_packet->pkt->length =
205 header.headerLength + payload_data_length - REDHeaderLength; 203 header.headerLength + payload_data_length - REDHeaderLength;
206 } 204 }
207 205
208 if (received_packet->pkt->length == 0) { 206 if (received_packet->pkt->length == 0) {
209 return 0; 207 return 0;
210 } 208 }
211 209
212 received_packet_list_.push_back(received_packet.release()); 210 received_packet_list_.push_back(std::move(received_packet));
213 if (second_received_packet) { 211 if (second_received_packet) {
214 received_packet_list_.push_back(second_received_packet.release()); 212 received_packet_list_.push_back(std::move(second_received_packet));
215 } 213 }
216 return 0; 214 return 0;
217 } 215 }
218 216
219 int32_t FecReceiverImpl::ProcessReceivedFec() { 217 int32_t FecReceiverImpl::ProcessReceivedFec() {
220 crit_sect_.Enter(); 218 crit_sect_.Enter();
221 if (!received_packet_list_.empty()) { 219 if (!received_packet_list_.empty()) {
222 // Send received media packet to VCM. 220 // Send received media packet to VCM.
223 if (!received_packet_list_.front()->is_fec) { 221 if (!received_packet_list_.front()->is_fec) {
224 ForwardErrorCorrection::Packet* packet = 222 ForwardErrorCorrection::Packet* packet =
225 received_packet_list_.front()->pkt; 223 received_packet_list_.front()->pkt;
226 crit_sect_.Leave(); 224 crit_sect_.Leave();
227 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, 225 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data,
228 packet->length)) { 226 packet->length)) {
229 return -1; 227 return -1;
230 } 228 }
231 crit_sect_.Enter(); 229 crit_sect_.Enter();
232 } 230 }
233 if (fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_) != 0) { 231 if (fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_) != 0) {
234 crit_sect_.Leave(); 232 crit_sect_.Leave();
235 return -1; 233 return -1;
236 } 234 }
237 RTC_DCHECK(received_packet_list_.empty()); 235 RTC_DCHECK(received_packet_list_.empty());
238 } 236 }
239 // Send any recovered media packets to VCM. 237 // Send any recovered media packets to VCM.
240 for(auto* recovered_packet : recovered_packet_list_) { 238 for (const auto& recovered_packet : recovered_packet_list_) {
241 if (recovered_packet->returned) { 239 if (recovered_packet->returned) {
242 // Already sent to the VCM and the jitter buffer. 240 // Already sent to the VCM and the jitter buffer.
243 continue; 241 continue;
244 } 242 }
245 ForwardErrorCorrection::Packet* packet = recovered_packet->pkt; 243 ForwardErrorCorrection::Packet* packet = recovered_packet->pkt;
246 ++packet_counter_.num_recovered_packets; 244 ++packet_counter_.num_recovered_packets;
247 crit_sect_.Leave(); 245 crit_sect_.Leave();
248 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data, 246 if (!recovered_packet_callback_->OnRecoveredPacket(packet->data,
249 packet->length)) { 247 packet->length)) {
250 return -1; 248 return -1;
251 } 249 }
252 crit_sect_.Enter(); 250 crit_sect_.Enter();
253 recovered_packet->returned = true; 251 recovered_packet->returned = true;
254 } 252 }
255 crit_sect_.Leave(); 253 crit_sect_.Leave();
256 return 0; 254 return 0;
257 } 255 }
258 256
259 } // namespace webrtc 257 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698