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 "media/video/capture/screen/screen_capturer_helper.h" | 5 #include "media/video/capture/screen/screen_capturer_helper.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 | 11 |
12 namespace media { | 12 namespace media { |
13 | 13 |
14 ScreenCapturerHelper::ScreenCapturerHelper() : | 14 ScreenCapturerHelper::ScreenCapturerHelper() : |
15 size_most_recent_(SkISize::Make(0, 0)), | |
16 log_grid_size_(0) { | 15 log_grid_size_(0) { |
17 } | 16 } |
18 | 17 |
19 ScreenCapturerHelper::~ScreenCapturerHelper() { | 18 ScreenCapturerHelper::~ScreenCapturerHelper() { |
20 } | 19 } |
21 | 20 |
22 void ScreenCapturerHelper::ClearInvalidRegion() { | 21 void ScreenCapturerHelper::ClearInvalidRegion() { |
23 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); | 22 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
24 invalid_region_.setEmpty(); | 23 invalid_region_.setEmpty(); |
25 } | 24 } |
26 | 25 |
27 void ScreenCapturerHelper::InvalidateRegion( | 26 void ScreenCapturerHelper::InvalidateRegion( |
28 const SkRegion& invalid_region) { | 27 const webrtc::DesktopRegion& invalid_region) { |
29 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); | 28 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
30 invalid_region_.op(invalid_region, SkRegion::kUnion_Op); | 29 for (webrtc::DesktopRegion::Iterator it(invalid_region); |
| 30 !it.IsAtEnd(); it.Advance()) { |
| 31 invalid_region_.op(SkIRect::MakeLTRB(it.rect().left(), it.rect().top(), |
| 32 it.rect().right(), it.rect().bottom()), |
| 33 SkRegion::kUnion_Op); |
| 34 } |
31 } | 35 } |
32 | 36 |
33 void ScreenCapturerHelper::InvalidateScreen(const SkISize& size) { | 37 void ScreenCapturerHelper::InvalidateScreen(const webrtc::DesktopSize& size) { |
34 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); | 38 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
35 invalid_region_.op(SkIRect::MakeWH(size.width(), size.height()), | 39 invalid_region_.op(SkIRect::MakeWH(size.width(), size.height()), |
36 SkRegion::kUnion_Op); | 40 SkRegion::kUnion_Op); |
37 } | 41 } |
38 | 42 |
39 void ScreenCapturerHelper::InvalidateFullScreen() { | 43 void ScreenCapturerHelper::TakeInvalidRegion( |
40 if (!size_most_recent_.isZero()) | 44 webrtc::DesktopRegion* invalid_region) { |
41 InvalidateScreen(size_most_recent_); | 45 SkRegion sk_invalid_region; |
42 } | |
43 | |
44 void ScreenCapturerHelper::SwapInvalidRegion(SkRegion* invalid_region) { | |
45 { | 46 { |
46 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); | 47 base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
47 invalid_region->swap(invalid_region_); | 48 sk_invalid_region.swap(invalid_region_); |
48 } | 49 } |
| 50 |
49 if (log_grid_size_ > 0) { | 51 if (log_grid_size_ > 0) { |
50 scoped_ptr<SkRegion> expanded_region( | 52 scoped_ptr<SkRegion> expanded_region( |
51 ExpandToGrid(*invalid_region, log_grid_size_)); | 53 ExpandToGrid(sk_invalid_region, log_grid_size_)); |
52 invalid_region->swap(*expanded_region); | 54 sk_invalid_region.swap(*expanded_region); |
53 invalid_region->op(SkRegion(SkIRect::MakeSize(size_most_recent_)), | 55 sk_invalid_region.op(SkIRect::MakeWH(size_most_recent_.width(), |
54 SkRegion::kIntersect_Op); | 56 size_most_recent_.height()), |
| 57 SkRegion::kIntersect_Op); |
| 58 } |
| 59 invalid_region->Clear(); |
| 60 for (SkRegion::Iterator it(sk_invalid_region); !it.done(); it.next()) { |
| 61 invalid_region->AddRect(webrtc::DesktopRect::MakeLTRB( |
| 62 it.rect().left(), it.rect().top(), |
| 63 it.rect().right(), it.rect().bottom())); |
55 } | 64 } |
56 } | 65 } |
57 | 66 |
58 void ScreenCapturerHelper::SetLogGridSize(int log_grid_size) { | 67 void ScreenCapturerHelper::SetLogGridSize(int log_grid_size) { |
59 log_grid_size_ = log_grid_size; | 68 log_grid_size_ = log_grid_size; |
60 } | 69 } |
61 | 70 |
62 const SkISize& ScreenCapturerHelper::size_most_recent() const { | 71 const webrtc::DesktopSize& ScreenCapturerHelper::size_most_recent() const { |
63 return size_most_recent_; | 72 return size_most_recent_; |
64 } | 73 } |
65 | 74 |
66 void ScreenCapturerHelper::set_size_most_recent(const SkISize& size) { | 75 void ScreenCapturerHelper::set_size_most_recent( |
| 76 const webrtc::DesktopSize& size) { |
67 size_most_recent_ = size; | 77 size_most_recent_ = size; |
68 } | 78 } |
69 | 79 |
70 // Returns the largest multiple of |n| that is <= |x|. | 80 // Returns the largest multiple of |n| that is <= |x|. |
71 // |n| must be a power of 2. |nMask| is ~(|n| - 1). | 81 // |n| must be a power of 2. |nMask| is ~(|n| - 1). |
72 static int DownToMultiple(int x, int nMask) { | 82 static int DownToMultiple(int x, int nMask) { |
73 return (x & nMask); | 83 return (x & nMask); |
74 } | 84 } |
75 | 85 |
76 // Returns the smallest multiple of |n| that is >= |x|. | 86 // Returns the smallest multiple of |n| that is >= |x|. |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 bottom = UpToMultiple(bottom, grid_size, grid_size_mask); | 119 bottom = UpToMultiple(bottom, grid_size, grid_size_mask); |
110 rects[rectI++] = SkIRect::MakeLTRB(left, top, right, bottom); | 120 rects[rectI++] = SkIRect::MakeLTRB(left, top, right, bottom); |
111 } | 121 } |
112 // Make the union of the expanded rects. | 122 // Make the union of the expanded rects. |
113 scoped_ptr<SkRegion> regionNew(new SkRegion()); | 123 scoped_ptr<SkRegion> regionNew(new SkRegion()); |
114 regionNew->setRects(rects.get(), rectNum); | 124 regionNew->setRects(rects.get(), rectNum); |
115 return regionNew.Pass(); | 125 return regionNew.Pass(); |
116 } | 126 } |
117 | 127 |
118 } // namespace media | 128 } // namespace media |
OLD | NEW |