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

Unified Diff: remoting/protocol/session_config.cc

Issue 850983002: Implement video frame acknowledgements in the chromoting protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: remoting/protocol/session_config.cc
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc
index 460da2807bfa7bd13b1cbdbca1eac2b837b08e66..a5955c01e0d152ba8a599ab05e4b1f99c42fd51d 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -11,6 +11,7 @@ namespace protocol {
const int kDefaultStreamVersion = 2;
const int kControlStreamVersion = 3;
+const int kVideoWithAckStreamVersion = 3;
ChannelConfig ChannelConfig::None() {
return ChannelConfig();
@@ -182,8 +183,10 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
// Video channel.
result->mutable_video_configs()->push_back(
- ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
- kDefaultStreamVersion,
+ ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kVideoWithAckStreamVersion,
+ ChannelConfig::CODEC_VP8));
+ result->mutable_video_configs()->push_back(
+ ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion,
ChannelConfig::CODEC_VP8));
Wez 2015/01/21 01:35:40 This looks like you're enabling the new video-with
Sergey Ulanov 2015/01/29 01:33:29 Done.
// Audio channel.
@@ -202,10 +205,10 @@ void CandidateSessionConfig::DisableAudioChannel() {
}
void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) {
- mutable_video_configs()->push_front(
- ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
- kDefaultStreamVersion,
- codec));
+ mutable_video_configs()->push_front(ChannelConfig(
+ ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, codec));
+ mutable_video_configs()->push_front(ChannelConfig(
+ ChannelConfig::TRANSPORT_STREAM, kVideoWithAckStreamVersion, codec));
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698