zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup FEC code after refactoring

Browse Source 
This CL removes length field from Packet class, as COW buffer data
already has length.

Bug: webrtc:10750
Change-Id: I5c2a857b72007e82e819e7fa5f5aeb2e074730fa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144942
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28540}
This commit is contained in:
Ilya Nikolaevskiy
2019-07-10 11:28:51 +02:00
committed by Commit Bot
parent 7325bc3917
commit 4e5a41a086
18 changed files with 112 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
View File

@ -133,7 +133,6 @@ int32_t UlpfecReceiverImpl::AddReceivedRedPacket(
received_packet->pkt->data.SetData(
incoming_rtp_packet + header.headerLength + red_header_length,
payload_data_length - red_header_length);
received_packet->pkt->length = payload_data_length - red_header_length;
received_packet->ssrc =
ByteReader<uint32_t>::ReadBigEndian(&incoming_rtp_packet[8]);
@ -152,11 +151,9 @@ int32_t UlpfecReceiverImpl::AddReceivedRedPacket(
incoming_rtp_packet + header.headerLength + red_header_length,
payload_data_length - red_header_length);
}
received_packet->pkt->length =
header.headerLength + payload_data_length - red_header_length;
}
if (received_packet->pkt->length == 0) {
if (received_packet->pkt->data.size() == 0) {
return 0;
}
@ -185,7 +182,7 @@ int32_t UlpfecReceiverImpl::ProcessReceivedFec() {
ForwardErrorCorrection::Packet* packet = received_packet->pkt;
crit_sect_.Leave();
recovered_packet_callback_->OnRecoveredPacket(packet->data.data(),
packet->length);
packet->data.size());
crit_sect_.Enter();
// Create a packet with the buffer to modify it.
RtpPacketReceived rtp_packet;
@ -213,7 +210,7 @@ int32_t UlpfecReceiverImpl::ProcessReceivedFec() {
recovered_packet->returned = true;
crit_sect_.Leave();
recovered_packet_callback_->OnRecoveredPacket(packet->data.data(),
packet->length);
packet->data.size());
crit_sect_.Enter();
}