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

Fix a downstream test failure.

Browse Source 
In rare case the packets number may loop around and in the same FEC-protected group the packet sequence number became out of order.

Bug: chromium:850493
Change-Id: Ice82aafd537e0edc1dbdb8b934e11e7c42a4cf60
Reviewed-on: https://webrtc-review.googlesource.com/82802
Commit-Queue: Ying Wang <yinwa@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23633}
This commit is contained in:
Ying Wang
2018-06-15 14:54:16 +02:00
committed by Commit Bot
parent c235a8d2bb
commit 6a9bd74481
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rtp_rtcp/source/forward_error_correction_internal.cc
View File

@ -498,6 +498,8 @@ void CopyColumn(uint8_t* new_mask,
int num_fec_packets, int num_fec_packets,
int new_bit_index, int new_bit_index,
int old_bit_index) { int old_bit_index) {
RTC_CHECK_LT(new_bit_index, 8 * new_mask_bytes);
// Copy column from the old mask to the beginning of the new mask and shift it // Copy column from the old mask to the beginning of the new mask and shift it
// out from the old mask. // out from the old mask.
for (uint16_t row = 0; row < num_fec_packets; ++row) { for (uint16_t row = 0; row < num_fec_packets; ++row) {

13
test/fuzzers/ulpfec_generator_fuzzer.cc
View File

@ -31,7 +31,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
data[i++] % 128, static_cast<int>(data[i++] % 10), kFecMaskBursty}; data[i++] % 128, static_cast<int>(data[i++] % 10), kFecMaskBursty};
generator.SetFecParameters(params); generator.SetFecParameters(params);
uint16_t seq_num = data[i++]; uint16_t seq_num = data[i++];
uint16_t prev_seq_num = 0;
while (i + 3 < size) { while (i + 3 < size) {
size_t rtp_header_length = data[i++] % 10 + 12; size_t rtp_header_length = data[i++] % 10 + 12;
size_t payload_size = data[i++] % 10; size_t payload_size = data[i++] % 10;
@ -40,13 +40,20 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
std::unique_ptr<uint8_t[]> packet( std::unique_ptr<uint8_t[]> packet(
new uint8_t[payload_size + rtp_header_length]); new uint8_t[payload_size + rtp_header_length]);
memcpy(packet.get(), &data[i], payload_size + rtp_header_length); memcpy(packet.get(), &data[i], payload_size + rtp_header_length);
// Make sure sequence numbers are increasing.
ByteWriter<uint16_t>::WriteBigEndian(&packet[2], seq_num++); ByteWriter<uint16_t>::WriteBigEndian(&packet[2], seq_num++);
i += payload_size + rtp_header_length; i += payload_size + rtp_header_length;
// Make sure sequence numbers are increasing.
const bool protect = data[i++] % 2 == 1; const bool protect = data[i++] % 2 == 1;
if (protect) {
// Check the sequence numbers are monotonic. In rare case the packets number
// may loop around and in the same FEC-protected group the packet sequence
// number became out of order.
if (protect && static_cast<uint16_t>(seq_num - prev_seq_num) <
kUlpfecMaxMediaPackets) {
generator.AddRtpPacketAndGenerateFec(packet.get(), payload_size, generator.AddRtpPacketAndGenerateFec(packet.get(), payload_size,
rtp_header_length); rtp_header_length);
prev_seq_num = seq_num;
} }
const size_t num_fec_packets = generator.NumAvailableFecPackets(); const size_t num_fec_packets = generator.NumAvailableFecPackets();
if (num_fec_packets > 0) { if (num_fec_packets > 0) {