OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/frame_consumer_proxy.h" | 5 #include "remoting/client/frame_consumer_proxy.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/thread_task_runner_handle.h" | |
10 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 11 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
11 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 12 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
12 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" | 13 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" |
13 | 14 |
14 namespace remoting { | 15 namespace remoting { |
15 | 16 |
16 FrameConsumerProxy::FrameConsumerProxy( | 17 FrameConsumerProxy::FrameConsumerProxy( |
17 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | |
18 const base::WeakPtr<FrameConsumer>& frame_consumer) | 18 const base::WeakPtr<FrameConsumer>& frame_consumer) |
19 : frame_consumer_(frame_consumer), | 19 : frame_consumer_(frame_consumer), |
20 task_runner_(task_runner) { | 20 task_runner_(base::ThreadTaskRunnerHandle::Get()) { |
21 pixel_format_ = frame_consumer_->GetPixelFormat(); | 21 pixel_format_ = frame_consumer_->GetPixelFormat(); |
22 } | 22 } |
23 | 23 |
24 static void DoApplyBuffer(base::WeakPtr<FrameConsumer> frame_consumer, | |
25 const webrtc::DesktopSize& view_size, | |
26 const webrtc::DesktopRect& clip_area, | |
27 webrtc::DesktopFrame* buffer, | |
28 const webrtc::DesktopRegion& region, | |
29 scoped_ptr<webrtc::DesktopRegion> shape) { | |
30 if (!frame_consumer) | |
31 return; | |
32 | |
33 frame_consumer->ApplyBuffer(view_size, clip_area, buffer, region, | |
34 shape.get()); | |
35 } | |
36 | |
24 void FrameConsumerProxy::ApplyBuffer(const webrtc::DesktopSize& view_size, | 37 void FrameConsumerProxy::ApplyBuffer(const webrtc::DesktopSize& view_size, |
25 const webrtc::DesktopRect& clip_area, | 38 const webrtc::DesktopRect& clip_area, |
26 webrtc::DesktopFrame* buffer, | 39 webrtc::DesktopFrame* buffer, |
27 const webrtc::DesktopRegion& region, | 40 const webrtc::DesktopRegion& region, |
28 const webrtc::DesktopRegion& shape) { | 41 const webrtc::DesktopRegion* shape) { |
29 if (!task_runner_->BelongsToCurrentThread()) { | 42 scoped_ptr<webrtc::DesktopRegion> shape_ptr; |
Sergey Ulanov
2015/07/13 21:00:32
maybe call it shape_copy?.
| |
30 task_runner_->PostTask(FROM_HERE, base::Bind( | 43 if (shape) |
31 &FrameConsumerProxy::ApplyBuffer, this, | 44 shape_ptr = make_scoped_ptr(new webrtc::DesktopRegion(*shape)); |
Sergey Ulanov
2015/07/13 21:00:32
might be better to initialize it in the constructo
| |
32 view_size, clip_area, buffer, region, shape)); | 45 task_runner_->PostTask( |
33 return; | 46 FROM_HERE, |
34 } | 47 base::Bind(DoApplyBuffer, frame_consumer_, view_size, clip_area, buffer, |
35 | 48 region, base::Passed(&shape_ptr))); |
36 if (frame_consumer_.get()) | |
37 frame_consumer_->ApplyBuffer(view_size, clip_area, buffer, region, shape); | |
38 } | 49 } |
39 | 50 |
40 void FrameConsumerProxy::ReturnBuffer(webrtc::DesktopFrame* buffer) { | 51 void FrameConsumerProxy::ReturnBuffer(webrtc::DesktopFrame* buffer) { |
41 if (!task_runner_->BelongsToCurrentThread()) { | 52 task_runner_->PostTask(FROM_HERE, base::Bind(&FrameConsumer::ReturnBuffer, |
42 task_runner_->PostTask(FROM_HERE, base::Bind( | 53 frame_consumer_, buffer)); |
43 &FrameConsumerProxy::ReturnBuffer, this, buffer)); | |
44 return; | |
45 } | |
46 | |
47 if (frame_consumer_.get()) | |
48 frame_consumer_->ReturnBuffer(buffer); | |
49 } | 54 } |
50 | 55 |
51 void FrameConsumerProxy::SetSourceSize( | 56 void FrameConsumerProxy::SetSourceSize( |
52 const webrtc::DesktopSize& source_size, | 57 const webrtc::DesktopSize& source_size, |
53 const webrtc::DesktopVector& source_dpi) { | 58 const webrtc::DesktopVector& source_dpi) { |
54 if (!task_runner_->BelongsToCurrentThread()) { | 59 task_runner_->PostTask( |
55 task_runner_->PostTask(FROM_HERE, base::Bind( | 60 FROM_HERE, base::Bind(&FrameConsumer::SetSourceSize, frame_consumer_, |
56 &FrameConsumerProxy::SetSourceSize, this, source_size, source_dpi)); | 61 source_size, source_dpi)); |
57 return; | |
58 } | |
59 | |
60 if (frame_consumer_.get()) | |
61 frame_consumer_->SetSourceSize(source_size, source_dpi); | |
62 } | 62 } |
63 | 63 |
64 FrameConsumer::PixelFormat FrameConsumerProxy::GetPixelFormat() { | 64 FrameConsumer::PixelFormat FrameConsumerProxy::GetPixelFormat() { |
65 return pixel_format_; | 65 return pixel_format_; |
66 } | 66 } |
67 | 67 |
68 FrameConsumerProxy::~FrameConsumerProxy() { | 68 FrameConsumerProxy::~FrameConsumerProxy() { |
69 } | 69 } |
70 | 70 |
71 } // namespace remoting | 71 } // namespace remoting |
OLD | NEW |