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

Revert r5294 to re-roll r5293.

Browse Source 
To fix races in test each stream now owns its own encoder/decoder.

R=mflodman@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/5919004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5297 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-12-16 12:24:44 +00:00
parent 5c64508b03
commit 5ab756703e
19 changed files with 414 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -391,9 +391,11 @@ bool RTPHeaderParser::Parse(RTPHeader& header,
// If in effect, MAY be omitted for those packets for which the offset
// is zero.
header.extension.hasTransmissionTimeOffset = false;
header.extension.transmissionTimeOffset = 0;
// May not be present in packet.
header.extension.hasAbsoluteSendTime = false;
header.extension.absoluteSendTime = 0;
if (X) {
@ -490,6 +492,7 @@ void RTPHeaderParser::ParseOneByteExtensionHeader(
// Negative offset, correct sign for Word24 to Word32.
header.extension.transmissionTimeOffset |= 0xFF000000;
}
header.extension.hasTransmissionTimeOffset = true;
break;
}
case kRtpExtensionAudioLevel: {
@ -524,6 +527,7 @@ void RTPHeaderParser::ParseOneByteExtensionHeader(
absoluteSendTime += *ptr++ << 8;
absoluteSendTime += *ptr++;
header.extension.absoluteSendTime = absoluteSendTime;
header.extension.hasAbsoluteSendTime = true;
break;
}
default: {