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

Unified Diff: remoting/protocol/session_config.h

Issue 10532211: Added piping for sending audio packets from host to client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unittests Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/jingle_messages_unittest.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session_config.h
diff --git a/remoting/protocol/session_config.h b/remoting/protocol/session_config.h
index e1cd39e26defae639cf7ede134fa69a0b2db9c01..02ee7f1900b2636269ed9cf29fa5bdbfeee5333b 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 {
@@ -30,6 +31,7 @@ struct ChannelConfig {
CODEC_VERBATIM,
CODEC_ZIP,
CODEC_VP8,
+ CODEC_VORBIS,
};
ChannelConfig();
@@ -50,6 +52,8 @@ struct ChannelConfig {
// chromotocol configuration.
class SessionConfig {
public:
+ SessionConfig();
+
void set_control_config(const ChannelConfig& control_config) {
control_config_ = control_config;
}
@@ -62,6 +66,14 @@ 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_; }
+
+ bool is_audio_enabled() const {
+ return audio_config_.transport != ChannelConfig::TRANSPORT_NONE;
+ }
static SessionConfig GetDefault();
@@ -69,6 +81,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 +115,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 +161,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
« no previous file with comments | « remoting/protocol/jingle_messages_unittest.cc ('k') | remoting/protocol/session_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698