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

Attempt on read-only acceptance of -12.

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

6
talk/app/webrtc/webrtcsdp_unittest.cc
View File

@ -284,10 +284,10 @@ static const char kSdpSctpDataChannelString[] =
"a=mid:data_content_name\r\n"
"a=sctpmap:5000 webrtc-datachannel 1024\r\n";
// draft-ietf-mmusic-sctp-sdp-07
// draft-ietf-mmusic-sctp-sdp-12
static const char kSdpSctpDataChannelStringWithSctpPort[] =
"m=application 9 DTLS/SCTP webrtc-datachannel\r\n"
"a=fmtp:webrtc-datachannel max-message-size=100000\r\n"
"m=application 9 UDP/DTLS/SCTP webrtc-datachannel\r\n"
"a=max-message-size=100000\r\n"
"a=sctp-port 5000\r\n"
"c=IN IP4 0.0.0.0\r\n"
"a=ice-ufrag:ufrag_data\r\n"

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

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

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

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