| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/session_config.h" | 5 #include "remoting/protocol/session_config.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 namespace remoting { | 9 namespace remoting { |
| 10 namespace protocol { | 10 namespace protocol { |
| 11 | 11 |
| 12 const int kDefaultStreamVersion = 1; | 12 const int kDefaultStreamVersion = 2; |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 const int kDefaultWidth = 800; | 15 const int kDefaultWidth = 800; |
| 16 const int kDefaultHeight = 600; | 16 const int kDefaultHeight = 600; |
| 17 } // namespace | 17 } // namespace |
| 18 | 18 |
| 19 ChannelConfig::ChannelConfig() { | 19 ChannelConfig::ChannelConfig() { |
| 20 Reset(); | 20 Reset(); |
| 21 } | 21 } |
| 22 | 22 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 ChannelConfig::CODEC_UNDEFINED)); | 216 ChannelConfig::CODEC_UNDEFINED)); |
| 217 result->mutable_video_configs()->push_back( | 217 result->mutable_video_configs()->push_back( |
| 218 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, | 218 ChannelConfig(ChannelConfig::TRANSPORT_STREAM, |
| 219 kDefaultStreamVersion, | 219 kDefaultStreamVersion, |
| 220 ChannelConfig::CODEC_VP8)); | 220 ChannelConfig::CODEC_VP8)); |
| 221 return result; | 221 return result; |
| 222 } | 222 } |
| 223 | 223 |
| 224 } // namespace protocol | 224 } // namespace protocol |
| 225 } // namespace remoting | 225 } // namespace remoting |
| OLD | NEW |