generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix in SendPadData. Do not increase sequence number if packet is "empty" and not sent.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/508001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2083 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
asapersson@webrtc.org 2012-04-20 13:20:27 +00:00
parent bb77000123
commit 63a34f4f29
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -546,6 +546,15 @@ WebRtc_Word32 RTPSender::SendPadData(WebRtc_Word8 payload_type,
WebRtc_UWord8 data_buffer[IP_PACKET_SIZE]; WebRtc_UWord8 data_buffer[IP_PACKET_SIZE];
for (; bytes > 0; bytes -= max_length) { for (; bytes > 0; bytes -= max_length) {
int padding_bytes_in_packet = max_length;
if (bytes < max_length) {
padding_bytes_in_packet = (bytes + 16) & 0xffe0; // Keep our modulus 32.
}
if (padding_bytes_in_packet < 32) {
// Sanity don't send empty packets.
break;
}
WebRtc_Word32 header_length; WebRtc_Word32 header_length;
{ {
// Correct seq num, timestamp and payload type. // Correct seq num, timestamp and payload type.
@ -560,14 +569,6 @@ WebRtc_Word32 RTPSender::SendPadData(WebRtc_Word8 payload_type,
WebRtc_Word32* data = WebRtc_Word32* data =
reinterpret_cast<WebRtc_Word32*>(&(data_buffer[header_length])); reinterpret_cast<WebRtc_Word32*>(&(data_buffer[header_length]));
int padding_bytes_in_packet = max_length;
if (bytes < max_length) {
padding_bytes_in_packet = (bytes + 16) & 0xffe0; // Keep our modulus 32.
}
if (padding_bytes_in_packet < 32) {
// Sanity don't send empty packets.
break;
}
// Fill data buffer with random data. // Fill data buffer with random data.
for(int j = 0; j < (padding_bytes_in_packet >> 2); j++) { for(int j = 0; j < (padding_bytes_in_packet >> 2); j++) {
data[j] = rand(); data[j] = rand();