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/strings/string_number_conversions.h" | 8 #include "base/strings/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 29 matching lines...) Expand all Loading... |
40 const NameMapElement<ChannelConfig::TransportType> kTransports[] = { | 40 const NameMapElement<ChannelConfig::TransportType> kTransports[] = { |
41 { ChannelConfig::TRANSPORT_STREAM, "stream" }, | 41 { ChannelConfig::TRANSPORT_STREAM, "stream" }, |
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_VP9, "vp9" }, |
50 { ChannelConfig::CODEC_ZIP, "zip" }, | 51 { ChannelConfig::CODEC_ZIP, "zip" }, |
51 { ChannelConfig::CODEC_OPUS, "opus" }, | 52 { ChannelConfig::CODEC_OPUS, "opus" }, |
52 { ChannelConfig::CODEC_SPEEX, "speex" }, | 53 { ChannelConfig::CODEC_SPEEX, "speex" }, |
53 }; | 54 }; |
54 | 55 |
55 // Format a channel configuration tag for chromotocol session description, | 56 // Format a channel configuration tag for chromotocol session description, |
56 // e.g. for video channel: | 57 // e.g. for video channel: |
57 // <video transport="stream" version="1" codec="vp8" /> | 58 // <video transport="stream" version="1" codec="vp8" /> |
58 XmlElement* FormatChannelConfig(const ChannelConfig& config, | 59 XmlElement* FormatChannelConfig(const ChannelConfig& config, |
59 const std::string& tag_name) { | 60 const std::string& tag_name) { |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); | 233 const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); |
233 if (child) | 234 if (child) |
234 authenticator_message.reset(new XmlElement(*child)); | 235 authenticator_message.reset(new XmlElement(*child)); |
235 | 236 |
236 return scoped_ptr<ContentDescription>( | 237 return scoped_ptr<ContentDescription>( |
237 new ContentDescription(config.Pass(), authenticator_message.Pass())); | 238 new ContentDescription(config.Pass(), authenticator_message.Pass())); |
238 } | 239 } |
239 | 240 |
240 } // namespace protocol | 241 } // namespace protocol |
241 } // namespace remoting | 242 } // namespace remoting |
OLD | NEW |