Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: remoting/protocol/session_config.h

Issue 10832418: Removed Vorbis from the audio codecs and replaced it with Opus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resync-ed to top of tree Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/content_description.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_ 5 #ifndef REMOTING_PROTOCOL_SESSION_CONFIG_H_
6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_ 6 #define REMOTING_PROTOCOL_SESSION_CONFIG_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 TRANSPORT_MUX_STREAM, 25 TRANSPORT_MUX_STREAM,
26 TRANSPORT_DATAGRAM, 26 TRANSPORT_DATAGRAM,
27 TRANSPORT_NONE, 27 TRANSPORT_NONE,
28 }; 28 };
29 29
30 enum Codec { 30 enum Codec {
31 CODEC_UNDEFINED, // Used for event and control channels. 31 CODEC_UNDEFINED, // Used for event and control channels.
32 CODEC_VERBATIM, 32 CODEC_VERBATIM,
33 CODEC_ZIP, 33 CODEC_ZIP,
34 CODEC_VP8, 34 CODEC_VP8,
35 CODEC_VORBIS, 35 CODEC_OPUS,
36 CODEC_SPEEX, 36 CODEC_SPEEX,
37 }; 37 };
38 38
39 // The constructor that creates a config with transport field set to 39 // The constructor that creates a config with transport field set to
40 // TRANSPORT_NONE which indicates that corresponding channel is disabled. 40 // TRANSPORT_NONE which indicates that corresponding channel is disabled.
41 ChannelConfig(); 41 ChannelConfig();
42 42
43 // Creates a channel config with the specified parameters. 43 // Creates a channel config with the specified parameters.
44 ChannelConfig(TransportType transport, int version, Codec codec); 44 ChannelConfig(TransportType transport, int version, Codec codec);
45 45
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 std::vector<ChannelConfig> control_configs_; 165 std::vector<ChannelConfig> control_configs_;
166 std::vector<ChannelConfig> event_configs_; 166 std::vector<ChannelConfig> event_configs_;
167 std::vector<ChannelConfig> video_configs_; 167 std::vector<ChannelConfig> video_configs_;
168 std::vector<ChannelConfig> audio_configs_; 168 std::vector<ChannelConfig> audio_configs_;
169 }; 169 };
170 170
171 } // namespace protocol 171 } // namespace protocol
172 } // namespace remoting 172 } // namespace remoting
173 173
174 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_ 174 #endif // REMOTING_PROTOCOL_SESSION_CONFIG_H_
OLDNEW
« no previous file with comments | « remoting/protocol/content_description.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698