Add VideoLayout message.

remoting/host/client_session.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/host/client_session.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "remoting/base/capabilities.h"
+#include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_pump.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_extension_session.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/mouse_shape_pump.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/video_frame_pump.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
-// Default DPI to assume for old clients that use notifyClientDimensions.
-const int kDefaultDPI = 96;
-
 namespace remoting {
 
 namespace {
 
 // Name of command-line flag to disable use of I444 by default.
 const char kDisableI444SwitchName[] = "disable-i444";
 
 scoped_ptr<AudioEncoder> CreateAudioEncoder(
     const protocol::SessionConfig& config) {
   const protocol::ChannelConfig& audio_config = config.audio_config();
@@ skipping 76 matching lines @@
 
   VLOG(1) << "Received ClientResolution (dips_width="
           << resolution.dips_width() << ", dips_height="
           << resolution.dips_height() << ")";
 
   if (!screen_controls_)
     return;
 
   ScreenResolution client_resolution(
       webrtc::DesktopSize(resolution.dips_width(), resolution.dips_height()),
-      webrtc::DesktopVector(kDefaultDPI, kDefaultDPI));
+      webrtc::DesktopVector(kDefaultDpi, kDefaultDpi));
 
   // Try to match the client's resolution.
   screen_controls_->SetScreenResolution(client_resolution);
 }
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
   DCHECK(CalledOnValidThread());
 
   // Note that |video_stream_| may be null, depending upon whether
   // extensions choose to wrap or "steal" the video capturer or encoder.
@@ skipping 304 matching lines @@
 }
 
 scoped_ptr<protocol::ClipboardStub> ClientSession::CreateClipboardProxy() {
   DCHECK(CalledOnValidThread());
 
   return make_scoped_ptr(
       new protocol::ClipboardThreadProxy(client_clipboard_factory_.GetWeakPtr(),
                                          base::ThreadTaskRunnerHandle::Get()));
 }
 
-void ClientSession::OnScreenSizeChanged(const webrtc::DesktopSize& size) {
+void ClientSession::OnScreenSizeChanged(const webrtc::DesktopSize& size,
+                                        const webrtc::DesktopVector& dpi) {
   DCHECK(CalledOnValidThread());
+
   mouse_clamping_filter_.set_input_size(size);
   mouse_clamping_filter_.set_output_size(size);
+
+  if (connection_->session()->config().protocol() ==
+      protocol::SessionConfig::Protocol::WEBRTC) {
+    protocol::VideoLayout layout;
+    protocol::VideoTrackLayout* video_track = layout.add_video_track();
+    video_track->set_position_x(0);
+    video_track->set_position_y(0);
+    video_track->set_width(size.width() * kDefaultDpi / dpi.x());
+    video_track->set_height(size.height() * kDefaultDpi / dpi.y());
+    video_track->set_x_dpi(dpi.x());
+    video_track->set_y_dpi(dpi.y());
+    connection_->client_stub()->SetVideoLayout(layout);
+  }
 }
 
 }  // namespace remoting