| Index: remoting/protocol/session_config.h
|
| diff --git a/remoting/protocol/session_config.h b/remoting/protocol/session_config.h
|
| index e1cd39e26defae639cf7ede134fa69a0b2db9c01..f741a45c7cb14b5e572c78e32f8e0ae67d6fca43 100644
|
| --- a/remoting/protocol/session_config.h
|
| +++ b/remoting/protocol/session_config.h
|
| @@ -23,6 +23,7 @@ struct ChannelConfig {
|
| enum TransportType {
|
| TRANSPORT_STREAM,
|
| TRANSPORT_DATAGRAM,
|
| + TRANSPORT_NONE,
|
| };
|
|
|
| enum Codec {
|
| @@ -62,6 +63,10 @@ class SessionConfig {
|
| video_config_ = video_config;
|
| }
|
| const ChannelConfig& video_config() const { return video_config_; }
|
| + void set_audio_config(const ChannelConfig& audio_config) {
|
| + audio_config_ = audio_config;
|
| + }
|
| + const ChannelConfig& audio_config() const { return audio_config_; }
|
|
|
| static SessionConfig GetDefault();
|
|
|
| @@ -69,6 +74,7 @@ class SessionConfig {
|
| ChannelConfig control_config_;
|
| ChannelConfig event_config_;
|
| ChannelConfig video_config_;
|
| + ChannelConfig audio_config_;
|
| };
|
|
|
| // Defines session description that is sent from client to the host in the
|
| @@ -102,6 +108,14 @@ class CandidateSessionConfig {
|
| return &video_configs_;
|
| }
|
|
|
| + const std::vector<ChannelConfig>& audio_configs() const {
|
| + return audio_configs_;
|
| + }
|
| +
|
| + std::vector<ChannelConfig>* mutable_audio_configs() {
|
| + return &audio_configs_;
|
| + }
|
| +
|
| // Selects session configuration that is supported by both participants.
|
| // NULL is returned if such configuration doesn't exist. When selecting
|
| // channel configuration priority is given to the configs listed first
|
| @@ -140,6 +154,7 @@ class CandidateSessionConfig {
|
| std::vector<ChannelConfig> control_configs_;
|
| std::vector<ChannelConfig> event_configs_;
|
| std::vector<ChannelConfig> video_configs_;
|
| + std::vector<ChannelConfig> audio_configs_;
|
| };
|
|
|
| } // namespace protocol
|
|
|