Add VideoLayout message.

remoting/client/chromoting_client.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/chromoting_client.h"
 
 #include <utility>
 
 #include "remoting/base/capabilities.h"
+#include "remoting/base/constants.h"
 #include "remoting/client/audio_decode_scheduler.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/client_user_interface.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/ice_connection_to_host.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/negotiating_client_authenticator.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_renderer.h"
 #include "remoting/protocol/webrtc_connection_to_host.h"
 #include "remoting/signaling/jid_util.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace remoting {
 
 ChromotingClient::ChromotingClient(ClientContext* client_context,
                                    ClientUserInterface* user_interface,
                                    protocol::VideoRenderer* video_renderer,
                                    scoped_ptr<AudioPlayer> audio_player)
     : user_interface_(user_interface), video_renderer_(video_renderer) {
   DCHECK(client_context->main_task_runner()->BelongsToCurrentThread());
   if (audio_player) {
@@ skipping 105 matching lines @@
   user_interface_->SetPairingResponse(pairing_response);
 }
 
 void ChromotingClient::DeliverHostMessage(
     const protocol::ExtensionMessage& message) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   user_interface_->DeliverHostMessage(message);
 }
 
+void ChromotingClient::SetVideoLayout(const protocol::VideoLayout& layout) {
+  int num_video_tracks = layout.video_track_size();
+  if (num_video_tracks < 1) {
+    LOG(ERROR) << "Received VideoLayout message with 0 tracks.";
+    return;
+  }
+
+  if (layout.video_track_size() > 2) {

[Jamie, 2016/03/31 22:36:44]

Replace this call (and the next one) with num_video_tracks as well.

[Sergey Ulanov, 2016/03/31 23:05:25]

Done.

+    LOG(WARNING) << "Received VideoLayout message with "
+                 << layout.video_track_size()
+                 << " tracks. Only one track is supported.";
+  }
+
+  const protocol::VideoTrackLayout& track_layout = layout.video_track(0);
+  int x_dpi = track_layout.has_x_dpi() ? track_layout.x_dpi() : kDefaultDpi;
+  int y_dpi = track_layout.has_y_dpi() ? track_layout.y_dpi() : kDefaultDpi;
+  user_interface_->SetDesktopSize(
+      webrtc::DesktopSize(track_layout.width() * x_dpi / kDefaultDpi,
+                          track_layout.height() * y_dpi / kDefaultDpi),
+      webrtc::DesktopVector(x_dpi, y_dpi));
+}
+
 void ChromotingClient::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   user_interface_->GetClipboardStub()->InjectClipboardEvent(event);
 }
 
 void ChromotingClient::SetCursorShape(
     const protocol::CursorShapeInfo& cursor_shape) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 75 matching lines @@
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 }
 
 }  // namespace remoting