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

Remove packet initializer in RtpRtcpRtxNackTest.

Browse Source 
Fixes RtpRtcpRtxNackTest to not use uninitialized data when not sending
RTX.

BUG=webrtc:3183
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1427653007

Cr-Commit-Position: refs/heads/master@{#10665}
This commit is contained in:
pbos
2015-11-16 17:19:34 -08:00
committed by Commit bot
parent 854e84c7fb
commit 740c4f11e0
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc
View File

@ -105,10 +105,7 @@ class RtxLoopBackTransport : public webrtc::Transport {
if (ssrc == rtx_ssrc_) count_rtx_ssrc_++;
uint16_t sequence_number = (ptr[2] << 8) + ptr[3];
size_t packet_length = len;
// TODO(pbos): Figure out why this needs to be initialized. Likely this
// is hiding a bug either in test setup or other code.
// https://code.google.com/p/webrtc/issues/detail?id=3183
uint8_t restored_packet[1500] = {0};
uint8_t restored_packet[1500];
RTPHeader header;
rtc::scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
if (!parser->Parse(ptr, len, &header)) {
@ -136,21 +133,19 @@ class RtxLoopBackTransport : public webrtc::Transport {
if (!parser->Parse(restored_packet, packet_length, &header)) {
return false;
}
ptr = restored_packet;
} else {
rtp_payload_registry_->SetIncomingPayloadType(header);
}
const uint8_t* restored_packet_payload =
restored_packet + header.headerLength;
packet_length -= header.headerLength;
PayloadUnion payload_specific;
if (!rtp_payload_registry_->GetPayloadSpecifics(header.payloadType,
&payload_specific)) {
return false;
}
if (!rtp_receiver_->IncomingRtpPacket(header, restored_packet_payload,
packet_length, payload_specific,
true)) {
if (!rtp_receiver_->IncomingRtpPacket(header, ptr + header.headerLength,
packet_length - header.headerLength,
payload_specific, true)) {
return false;
}
return true;