| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/protocol/content_description.h" | 5 #include "remoting/protocol/content_description.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "remoting/base/constants.h" | 9 #include "remoting/base/constants.h" |
| 10 #include "remoting/protocol/authenticator.h" | 10 #include "remoting/protocol/authenticator.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 { ChannelConfig::TRANSPORT_MUX_STREAM, "mux-stream" }, | 42 { ChannelConfig::TRANSPORT_MUX_STREAM, "mux-stream" }, |
| 43 { ChannelConfig::TRANSPORT_DATAGRAM, "datagram" }, | 43 { ChannelConfig::TRANSPORT_DATAGRAM, "datagram" }, |
| 44 { ChannelConfig::TRANSPORT_NONE, "none" }, | 44 { ChannelConfig::TRANSPORT_NONE, "none" }, |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 const NameMapElement<ChannelConfig::Codec> kCodecs[] = { | 47 const NameMapElement<ChannelConfig::Codec> kCodecs[] = { |
| 48 { ChannelConfig::CODEC_VERBATIM, "verbatim" }, | 48 { ChannelConfig::CODEC_VERBATIM, "verbatim" }, |
| 49 { ChannelConfig::CODEC_VP8, "vp8" }, | 49 { ChannelConfig::CODEC_VP8, "vp8" }, |
| 50 { ChannelConfig::CODEC_ZIP, "zip" }, | 50 { ChannelConfig::CODEC_ZIP, "zip" }, |
| 51 { ChannelConfig::CODEC_VORBIS, "vorbis" }, | 51 { ChannelConfig::CODEC_VORBIS, "vorbis" }, |
| 52 { ChannelConfig::CODEC_SPEEX, "speex" }, |
| 52 }; | 53 }; |
| 53 | 54 |
| 54 // Format a channel configuration tag for chromotocol session description, | 55 // Format a channel configuration tag for chromotocol session description, |
| 55 // e.g. for video channel: | 56 // e.g. for video channel: |
| 56 // <video transport="stream" version="1" codec="vp8" /> | 57 // <video transport="stream" version="1" codec="vp8" /> |
| 57 XmlElement* FormatChannelConfig(const ChannelConfig& config, | 58 XmlElement* FormatChannelConfig(const ChannelConfig& config, |
| 58 const std::string& tag_name) { | 59 const std::string& tag_name) { |
| 59 XmlElement* result = new XmlElement( | 60 XmlElement* result = new XmlElement( |
| 60 QName(kChromotingXmlNamespace, tag_name)); | 61 QName(kChromotingXmlNamespace, tag_name)); |
| 61 | 62 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); | 222 const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); |
| 222 if (child) | 223 if (child) |
| 223 authenticator_message.reset(new XmlElement(*child)); | 224 authenticator_message.reset(new XmlElement(*child)); |
| 224 | 225 |
| 225 return scoped_ptr<ContentDescription>( | 226 return scoped_ptr<ContentDescription>( |
| 226 new ContentDescription(config.Pass(), authenticator_message.Pass())); | 227 new ContentDescription(config.Pass(), authenticator_message.Pass())); |
| 227 } | 228 } |
| 228 | 229 |
| 229 } // namespace protocol | 230 } // namespace protocol |
| 230 } // namespace remoting | 231 } // namespace remoting |
| OLD | NEW |