Client-side changes to support requesting lossless encode & color.

remoting/client/plugin/chromoting_instance.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/client/plugin/chromoting_instance.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 164 matching lines @@
 base::LazyInstance<base::Lock>::Leaky
     g_logging_lock = LAZY_INSTANCE_INITIALIZER;
 logging::LogMessageHandlerFunction g_logging_old_handler = NULL;
 
 }  // namespace
 
 // String sent in the "hello" message to the webapp to describe features.
 const char ChromotingInstance::kApiFeatures[] =
     "highQualityScaling injectKeyEvent sendClipboardItem remapKey trapKey "
     "notifyClientResolution pauseVideo pauseAudio asyncPin thirdPartyAuth "
-    "pinlessAuth extensionMessage allowMouseLock mediaSourceRendering";
+    "pinlessAuth extensionMessage allowMouseLock mediaSourceRendering "
+    "videoControl";
 
 const char ChromotingInstance::kRequestedCapabilities[] = "";
 const char ChromotingInstance::kSupportedCapabilities[] = "desktopShape";
 
 bool ChromotingInstance::ParseAuthMethods(const std::string& auth_methods_str,
                                           ClientConfig* config) {
   std::vector<std::string> auth_methods;
   base::SplitString(auth_methods_str, ',', &auth_methods);
   for (std::vector<std::string>::iterator it = auth_methods.begin();
        it != auth_methods.end(); ++it) {
@@ skipping 144 matching lines @@
   } else if (method == "remapKey") {
     HandleRemapKey(*data);
   } else if (method == "trapKey") {
     HandleTrapKey(*data);
   } else if (method == "sendClipboardItem") {
     HandleSendClipboardItem(*data);
   } else if (method == "notifyClientResolution") {
     HandleNotifyClientResolution(*data);
   } else if (method == "pauseVideo") {
     HandlePauseVideo(*data);
+  } else if (method == "videoControl") {
+    HandleVideoControl(*data);
   } else if (method == "pauseAudio") {
     HandlePauseAudio(*data);
   } else if (method == "useAsyncPinDialog") {
     use_async_pin_dialog_ = true;
   } else if (method == "onPinFetched") {
     HandleOnPinFetched(*data);
   } else if (method == "onThirdPartyTokenFetched") {
     HandleOnThirdPartyTokenFetched(*data);
   } else if (method == "requestPairing") {
     HandleRequestPairing(*data);
@@ skipping 504 matching lines @@
   client_resolution.set_y_dpi(y_dpi);
 
   // Include the legacy width & height in DIPs for use by older hosts.
   client_resolution.set_dips_width((width * kDefaultDPI) / x_dpi);
   client_resolution.set_dips_height((height * kDefaultDPI) / y_dpi);
 
   host_connection_->host_stub()->NotifyClientResolution(client_resolution);
 }
 
 void ChromotingInstance::HandlePauseVideo(const base::DictionaryValue& data) {
-  bool pause = false;
-  if (!data.GetBoolean("pause", &pause)) {
+  if (!data.HasKey("pause")) {
     LOG(ERROR) << "Invalid pauseVideo.";
     return;
   }
+  HandleVideoControl(data);
+}
+
+void ChromotingInstance::HandleVideoControl(const base::DictionaryValue& data) {
+  protocol::VideoControl video_control;
+  bool pause_video = false;
+  if (data.GetBoolean("pause", &pause_video)) {
+    video_control.set_enable(!pause_video);
+  }
+  bool lossless_encode = false;
+  if (data.GetBoolean("lossless_encode", &lossless_encode)) {

[Jamie, 2014/05/28 22:21:19]

JS uses camelCase for variables. I'm not sure how consistent we are about doing
the same for the JSON exchanged with the client plugin, but unless this naming
convention is the norm, I'd prefer that we use it here too (it's used for the
method names, for example).

[Wez, 2014/05/28 22:41:07]

Makes sense. Done!

+    video_control.set_lossless_encode(lossless_encode);
+  }
+  bool lossless_color = false;
+  if (data.GetBoolean("lossless_color", &lossless_color)) {
+    video_control.set_lossless_color(lossless_color);
+  }
   if (!IsConnected()) {
     return;
   }
-  protocol::VideoControl video_control;
-  video_control.set_enable(!pause);
   host_connection_->host_stub()->ControlVideo(video_control);
 }
 
 void ChromotingInstance::HandlePauseAudio(const base::DictionaryValue& data) {
   bool pause = false;
   if (!data.GetBoolean("pause", &pause)) {
     LOG(ERROR) << "Invalid pauseAudio.";
     return;
   }
   if (!IsConnected()) {
@@ skipping 284 matching lines @@
   pp::VarArrayBuffer array_buffer(buffer_size);
   void* data_ptr = array_buffer.Map();
   memcpy(data_ptr, buffer, buffer_size);
   array_buffer.Unmap();
   pp::VarDictionary data_dictionary;
   data_dictionary.Set(pp::Var("buffer"), array_buffer);
   PostChromotingMessage("mediaSourceData", data_dictionary);
 }
 
 }  // namespace remoting