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

After another round of reviews.

Browse Source 
Cr-Commit-Position: refs/heads/master@{#8483}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8483 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
lally@webrtc.org
2015-02-24 20:19:21 +00:00
parent 9616196c38
commit a747093334
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
talk/app/webrtc/webrtcsdp.cc
View File

@ -1185,12 +1185,6 @@ bool ParseExtmap(const std::string& line, RtpHeaderExtension* extmap,
return true; return true;
} }
static bool IsSctp(const std::string& protocol) {
return protocol == cricket::kMediaProtocolDtlsSctp
|| protocol == cricket::kMediaProtocolUdpDtlsSctp
|| protocol == cricket::kMediaProtocolSctp;
}
void BuildMediaDescription(const ContentInfo* content_info, void BuildMediaDescription(const ContentInfo* content_info,
const TransportInfo* transport_info, const TransportInfo* transport_info,
const MediaType media_type, const MediaType media_type,
@ -1827,8 +1821,7 @@ bool IsRtp(const std::string& protocol) {
bool IsDtlsSctp(const std::string& protocol) { bool IsDtlsSctp(const std::string& protocol) {
// This intentionally excludes "SCTP" and "SCTP/DTLS". // This intentionally excludes "SCTP" and "SCTP/DTLS".
return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos;
|| protocol.find(cricket::kMediaProtocolUdpDtlsSctp) != std::string::npos;
} }
bool ParseSessionDescription(const std::string& message, size_t* pos, bool ParseSessionDescription(const std::string& message, size_t* pos,

1
talk/session/media/mediasession.cc
View File

@ -72,6 +72,7 @@ const char kMediaProtocolRtpPrefix[] = "RTP/";
const char kMediaProtocolSctp[] = "SCTP"; const char kMediaProtocolSctp[] = "SCTP";
const char kMediaProtocolDtlsSctp[] = "DTLS/SCTP"; const char kMediaProtocolDtlsSctp[] = "DTLS/SCTP";
const char kMediaProtocolUdpDtlsSctp[] = "UDP/DTLS/SCTP"; const char kMediaProtocolUdpDtlsSctp[] = "UDP/DTLS/SCTP";
const char kMediaProtocolTcpDtlsSctp[] = "TCP/DTLS/SCTP";
static bool IsMediaContentOfType(const ContentInfo* content, static bool IsMediaContentOfType(const ContentInfo* content,
MediaType media_type) { MediaType media_type) {

1
talk/session/media/mediasession.h
View File

@ -87,6 +87,7 @@ extern const char kMediaProtocolRtpPrefix[];
extern const char kMediaProtocolSctp[]; extern const char kMediaProtocolSctp[];
extern const char kMediaProtocolDtlsSctp[]; extern const char kMediaProtocolDtlsSctp[];
extern const char kMediaProtocolUdpDtlsSctp[]; extern const char kMediaProtocolUdpDtlsSctp[];
extern const char kMediaProtocolTcpDtlsSctp[];
// Options to control how session descriptions are generated. // Options to control how session descriptions are generated.
const int kAutoBandwidth = -1; const int kAutoBandwidth = -1;