Implement video frame acknowledgements in the chromoting protocol.

remoting/protocol/session_config.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/session_config.h"
 
 #include <algorithm>
 
 namespace remoting {
 namespace protocol {
 
-const int kDefaultStreamVersion = 2;
+const int kEventStreamVersion = 2;
+const int kAudioStreamVersion = 2;
 const int kControlStreamVersion = 3;
+const int kVideoStreamVersion = 3;
+const int kVideoStreamVersionNoAck = 2;
 
 ChannelConfig ChannelConfig::None() {
   return ChannelConfig();
 }
 
 ChannelConfig::ChannelConfig()
     : transport(TRANSPORT_NONE),
       version(0),
       codec(CODEC_UNDEFINED) {
 }
@@ skipping 14 matching lines @@
 SessionConfig::SessionConfig() {
 }
 
 // static
 SessionConfig SessionConfig::ForTest() {
   SessionConfig result;
   result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                           kControlStreamVersion,
                                           ChannelConfig::CODEC_UNDEFINED));
   result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
-                                        kDefaultStreamVersion,
+                                        kEventStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED));
   result.set_video_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
-                                        kDefaultStreamVersion,
+                                        kVideoStreamVersion,
                                         ChannelConfig::CODEC_VP8));
   result.set_audio_config(ChannelConfig(ChannelConfig::TRANSPORT_NONE,
-                                        kDefaultStreamVersion,
+                                        kAudioStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED));
   return result;
 }
 
 CandidateSessionConfig::CandidateSessionConfig() { }
 
 CandidateSessionConfig::CandidateSessionConfig(
     const CandidateSessionConfig& config)
     : control_configs_(config.control_configs_),
       event_configs_(config.event_configs_),
@@ skipping 105 matching lines @@
 
   // Control channel.
   result->mutable_control_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kControlStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Event channel.
   result->mutable_event_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
-                    kDefaultStreamVersion,
+                    kEventStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Video channel.
   result->mutable_video_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
-                    kDefaultStreamVersion,
+      ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kVideoStreamVersion,
+                    ChannelConfig::CODEC_VP8));
+  result->mutable_video_configs()->push_back(
+      ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kVideoStreamVersionNoAck,
                     ChannelConfig::CODEC_VP8));
 
   // Audio channel.
   result->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
-                    kDefaultStreamVersion,
+                    kAudioStreamVersion,
                     ChannelConfig::CODEC_OPUS));
   result->mutable_audio_configs()->push_back(ChannelConfig::None());
 
   return result.Pass();
 }
 
 void CandidateSessionConfig::DisableAudioChannel() {
   mutable_audio_configs()->clear();
   mutable_audio_configs()->push_back(ChannelConfig());
 }
 
 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, kVideoStreamVersion, codec));
+  mutable_video_configs()->push_front(ChannelConfig(
+      ChannelConfig::TRANSPORT_STREAM, kVideoStreamVersionNoAck, codec));
 }
 
 }  // namespace protocol
 }  // namespace remoting