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 kControlStreamVersion = 3;
+const int kVideoWithAckStreamVersion = 3;
 
 ChannelConfig ChannelConfig::None() {
   return ChannelConfig();
 }
 
 ChannelConfig::ChannelConfig()
     : transport(TRANSPORT_NONE),
       version(0),
       codec(CODEC_UNDEFINED) {
 }
@@ skipping 151 matching lines @@
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Event channel.
   result->mutable_event_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // 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-ack all the time.

Rather than add kVideoWithAckStreamVersion, I'd suggest we switch to having
separate kDefaultVideoVersion, kDefaultEventVersion, kDefaultControlVersion, and
then in this CL an additional kNoAckVideoVersion that we can strip out once all
endpoints have the change.

[Sergey Ulanov, 2015/01/29 01:33:29]

Done.

 
   // Audio channel.
   result->mutable_audio_configs()->push_back(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     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, kDefaultStreamVersion, codec));
+  mutable_video_configs()->push_front(ChannelConfig(
+      ChannelConfig::TRANSPORT_STREAM, kVideoWithAckStreamVersion, codec));
 }
 
 }  // namespace protocol
 }  // namespace remoting