diff options
author | sergeyu <sergeyu@chromium.org> | 2016-03-25 13:27:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 20:28:56 +0000 |
commit | 24ed25b8af345a6004dfc45f52401aebe20ac76e (patch) | |
tree | c973836f55de3f214121c53b228e6865ed977496 /remoting/client/plugin | |
parent | 97ddb5c86d7d72e450db6618ec2937d751ecceb5 (diff) | |
download | chromium_src-24ed25b8af345a6004dfc45f52401aebe20ac76e.zip chromium_src-24ed25b8af345a6004dfc45f52401aebe20ac76e.tar.gz chromium_src-24ed25b8af345a6004dfc45f52401aebe20ac76e.tar.bz2 |
Remove shaped desktop support from remoting host and client.
We no longer need to support shaped desktop, so the corresponding
code can be removed.
Review URL: https://codereview.chromium.org/1827043004
Cr-Commit-Position: refs/heads/master@{#383340}
Diffstat (limited to 'remoting/client/plugin')
-rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 26 | ||||
-rw-r--r-- | remoting/client/plugin/chromoting_instance.h | 1 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_video_renderer.h | 4 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_video_renderer_2d.cc | 11 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_video_renderer_2d.h | 4 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_video_renderer_3d.cc | 21 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_video_renderer_3d.h | 2 |
7 files changed, 2 insertions, 67 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index a7c5601..af4954b 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -56,6 +56,7 @@ #include "remoting/protocol/host_stub.h" #include "remoting/protocol/transport_context.h" #include "third_party/webrtc/base/helpers.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" #include "url/gurl.h" namespace remoting { @@ -355,31 +356,6 @@ void ChromotingInstance::OnVideoSize(const webrtc::DesktopSize& size, PostLegacyJsonMessage("onDesktopSize", std::move(data)); } -void ChromotingInstance::OnVideoShape(const webrtc::DesktopRegion* shape) { - if ((shape && desktop_shape_ && shape->Equals(*desktop_shape_)) || - (!shape && !desktop_shape_)) { - return; - } - - scoped_ptr<base::DictionaryValue> shape_message(new base::DictionaryValue()); - if (shape) { - desktop_shape_ = make_scoped_ptr(new webrtc::DesktopRegion(*shape)); - scoped_ptr<base::ListValue> rects_value(new base::ListValue()); - for (webrtc::DesktopRegion::Iterator i(*shape); !i.IsAtEnd(); i.Advance()) { - const webrtc::DesktopRect& rect = i.rect(); - scoped_ptr<base::ListValue> rect_value(new base::ListValue()); - rect_value->AppendInteger(rect.left()); - rect_value->AppendInteger(rect.top()); - rect_value->AppendInteger(rect.width()); - rect_value->AppendInteger(rect.height()); - rects_value->Append(rect_value.release()); - } - shape_message->Set("rects", rects_value.release()); - } - - PostLegacyJsonMessage("onDesktopShape", std::move(shape_message)); -} - void ChromotingInstance::OnVideoFrameDirtyRegion( const webrtc::DesktopRegion& dirty_region) { scoped_ptr<base::ListValue> rects_value(new base::ListValue()); diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index 49c92c4..4ebb19d 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -132,7 +132,6 @@ class ChromotingInstance : public ClientUserInterface, void OnVideoFirstFrameReceived() override; void OnVideoSize(const webrtc::DesktopSize& size, const webrtc::DesktopVector& dpi) override; - void OnVideoShape(const webrtc::DesktopRegion* shape) override; void OnVideoFrameDirtyRegion( const webrtc::DesktopRegion& dirty_region) override; diff --git a/remoting/client/plugin/pepper_video_renderer.h b/remoting/client/plugin/pepper_video_renderer.h index a5637bc..32f5360 100644 --- a/remoting/client/plugin/pepper_video_renderer.h +++ b/remoting/client/plugin/pepper_video_renderer.h @@ -44,10 +44,6 @@ class PepperVideoRenderer : public protocol::VideoRenderer { virtual void OnVideoSize(const webrtc::DesktopSize& size, const webrtc::DesktopVector& dpi) = 0; - // Called when desktop shape changes. |shape| should be NULL if frames are - // un-shaped. - virtual void OnVideoShape(const webrtc::DesktopRegion* shape) = 0; - // Called with each frame's updated region, if EnableDebugDirtyRegion(true) // was called. virtual void OnVideoFrameDirtyRegion( diff --git a/remoting/client/plugin/pepper_video_renderer_2d.cc b/remoting/client/plugin/pepper_video_renderer_2d.cc index 978335b..214d404 100644 --- a/remoting/client/plugin/pepper_video_renderer_2d.cc +++ b/remoting/client/plugin/pepper_video_renderer_2d.cc @@ -159,17 +159,6 @@ void PepperVideoRenderer2D::DrawFrame(scoped_ptr<webrtc::DesktopFrame> frame, event_handler_->OnVideoSize(source_size_, source_dpi_); } - const webrtc::DesktopRegion* shape = frame->shape(); - if (shape) { - if (!source_shape_ || !source_shape_->Equals(*shape)) { - source_shape_ = make_scoped_ptr(new webrtc::DesktopRegion(*shape)); - event_handler_->OnVideoShape(source_shape_.get()); - } - } else if (source_shape_) { - source_shape_ = nullptr; - event_handler_->OnVideoShape(nullptr); - } - // If Debug dirty region is enabled then emit it. if (debug_dirty_region_) event_handler_->OnVideoFrameDirtyRegion(frame->updated_region()); diff --git a/remoting/client/plugin/pepper_video_renderer_2d.h b/remoting/client/plugin/pepper_video_renderer_2d.h index 014ccec..2c6336f 100644 --- a/remoting/client/plugin/pepper_video_renderer_2d.h +++ b/remoting/client/plugin/pepper_video_renderer_2d.h @@ -21,7 +21,6 @@ #include "remoting/client/plugin/pepper_video_renderer.h" #include "remoting/protocol/frame_consumer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" -#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" namespace base { class ScopedClosureRunner; @@ -86,9 +85,6 @@ class PepperVideoRenderer2D : public PepperVideoRenderer, // Resolution of the most recent source frame dots-per-inch. webrtc::DesktopVector source_dpi_; - // Shape of the most recent source frame. - scoped_ptr<webrtc::DesktopRegion> source_shape_; - // Done callbacks for the frames that have been painted but not flushed. ScopedVector<base::ScopedClosureRunner> pending_frames_done_callbacks_; diff --git a/remoting/client/plugin/pepper_video_renderer_3d.cc b/remoting/client/plugin/pepper_video_renderer_3d.cc index 4c22b14..dca14fd 100644 --- a/remoting/client/plugin/pepper_video_renderer_3d.cc +++ b/remoting/client/plugin/pepper_video_renderer_3d.cc @@ -19,6 +19,7 @@ #include "remoting/proto/video.pb.h" #include "remoting/protocol/performance_tracker.h" #include "remoting/protocol/session_config.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" namespace remoting { @@ -220,26 +221,6 @@ void PepperVideoRenderer3D::ProcessVideoPacket(scoped_ptr<VideoPacket> packet, if (resolution_changed) event_handler_->OnVideoSize(frame_size_, frame_dpi_); - // Process the frame shape, if supplied. - if (packet->has_use_desktop_shape()) { - if (packet->use_desktop_shape()) { - scoped_ptr<webrtc::DesktopRegion> shape(new webrtc::DesktopRegion); - for (int i = 0; i < packet->desktop_shape_rects_size(); ++i) { - Rect remoting_rect = packet->desktop_shape_rects(i); - shape->AddRect(webrtc::DesktopRect::MakeXYWH( - remoting_rect.x(), remoting_rect.y(), remoting_rect.width(), - remoting_rect.height())); - } - if (!frame_shape_ || !frame_shape_->Equals(*shape)) { - frame_shape_ = std::move(shape); - event_handler_->OnVideoShape(frame_shape_.get()); - } - } else if (frame_shape_) { - frame_shape_ = nullptr; - event_handler_->OnVideoShape(nullptr); - } - } - // Report the dirty region, for debugging, if requested. if (debug_dirty_region_) { webrtc::DesktopRegion dirty_region; diff --git a/remoting/client/plugin/pepper_video_renderer_3d.h b/remoting/client/plugin/pepper_video_renderer_3d.h index d7df94f..de2346e 100644 --- a/remoting/client/plugin/pepper_video_renderer_3d.h +++ b/remoting/client/plugin/pepper_video_renderer_3d.h @@ -20,7 +20,6 @@ #include "remoting/client/plugin/pepper_video_renderer.h" #include "remoting/protocol/video_stub.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" -#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" struct PPB_OpenGLES2; @@ -99,7 +98,6 @@ class PepperVideoRenderer3D : public PepperVideoRenderer, webrtc::DesktopSize frame_size_; webrtc::DesktopVector frame_dpi_; - scoped_ptr<webrtc::DesktopRegion> frame_shape_; webrtc::DesktopSize view_size_; |