summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/content_description.cc
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 22:26:49 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 22:26:49 +0000
commitd6f7b82a32eb60c8d41b9f205d6439e1071055c0 (patch)
tree0776048834b736b0741edef4467c3083b49ceed4 /remoting/protocol/content_description.cc
parentcec5b64f954504f5c6c95ebd7eec7e8fcfa15c87 (diff)
downloadchromium_src-d6f7b82a32eb60c8d41b9f205d6439e1071055c0.zip
chromium_src-d6f7b82a32eb60c8d41b9f205d6439e1071055c0.tar.gz
chromium_src-d6f7b82a32eb60c8d41b9f205d6439e1071055c0.tar.bz2
Remove RTP support from chromoting.
RTP was never used by chromoting and we have no plans using this code in the future. Also some other minor cleanups. Review URL: https://chromiumcodereview.appspot.com/10383294 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/content_description.cc')
-rw-r--r--remoting/protocol/content_description.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc
index 06fd309..c88a362 100644
--- a/remoting/protocol/content_description.cc
+++ b/remoting/protocol/content_description.cc
@@ -37,8 +37,6 @@ const char kDeprecatedHeightAttr[] = "height";
const char kStreamTransport[] = "stream";
const char kDatagramTransport[] = "datagram";
-const char kSrtpTransport[] = "srtp";
-const char kRtpDtlsTransport[] = "rtp-dtls";
const char kVerbatimCodec[] = "verbatim";
const char kVp8Codec[] = "vp8";
@@ -50,10 +48,6 @@ const char* GetTransportName(ChannelConfig::TransportType type) {
return kStreamTransport;
case ChannelConfig::TRANSPORT_DATAGRAM:
return kDatagramTransport;
- case ChannelConfig::TRANSPORT_SRTP:
- return kSrtpTransport;
- case ChannelConfig::TRANSPORT_RTP_DTLS:
- return kRtpDtlsTransport;
}
NOTREACHED();
return NULL;
@@ -77,7 +71,7 @@ const char* GetCodecName(ChannelConfig::Codec type) {
// Format a channel configuration tag for chromotocol session description,
// e.g. for video channel:
-// <video transport="srtp" version="1" codec="vp8" />
+// <video transport="stream" version="1" codec="vp8" />
XmlElement* FormatChannelConfig(const ChannelConfig& config,
const std::string& tag_name) {
XmlElement* result = new XmlElement(
@@ -103,10 +97,6 @@ bool ParseTransportName(const std::string& value,
*transport = ChannelConfig::TRANSPORT_STREAM;
} else if (value == kDatagramTransport) {
*transport = ChannelConfig::TRANSPORT_DATAGRAM;
- } else if (value == kSrtpTransport) {
- *transport = ChannelConfig::TRANSPORT_SRTP;
- } else if (value == kRtpDtlsTransport) {
- *transport = ChannelConfig::TRANSPORT_RTP_DTLS;
} else {
return false;
}
@@ -172,7 +162,7 @@ ContentDescription* ContentDescription::Copy() const {
// <description xmlns="google:remoting">
// <control transport="stream" version="1" />
// <event transport="datagram" version="1" />
-// <video transport="srtp" codec="vp8" version="1" />
+// <video transport="stream" codec="vp8" version="1" />
// <authentication>
// Message created by Authenticator implementation.
// </authentication>