Index: media/video/capture/screen/screen_capturer_helper.cc |
diff --git a/remoting/capturer/video_frame_capturer_helper.cc b/media/video/capture/screen/screen_capturer_helper.cc |
similarity index 78% |
rename from remoting/capturer/video_frame_capturer_helper.cc |
rename to media/video/capture/screen/screen_capturer_helper.cc |
index 7f0554861e28816a9d6a1f857bf04d38102951cb..afc82084936e32c4d65371f29ac4b3ccb3b29185 100644 |
--- a/remoting/capturer/video_frame_capturer_helper.cc |
+++ b/media/video/capture/screen/screen_capturer_helper.cc |
@@ -2,46 +2,46 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "remoting/capturer/video_frame_capturer_helper.h" |
+#include "media/video/capture/screen/screen_capturer_helper.h" |
#include <algorithm> |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
-namespace remoting { |
+namespace media { |
-VideoFrameCapturerHelper::VideoFrameCapturerHelper() : |
+ScreenCapturerHelper::ScreenCapturerHelper() : |
size_most_recent_(SkISize::Make(0, 0)), |
log_grid_size_(0) { |
} |
-VideoFrameCapturerHelper::~VideoFrameCapturerHelper() { |
+ScreenCapturerHelper::~ScreenCapturerHelper() { |
} |
-void VideoFrameCapturerHelper::ClearInvalidRegion() { |
+void ScreenCapturerHelper::ClearInvalidRegion() { |
base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
invalid_region_.setEmpty(); |
} |
-void VideoFrameCapturerHelper::InvalidateRegion( |
+void ScreenCapturerHelper::InvalidateRegion( |
const SkRegion& invalid_region) { |
base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
invalid_region_.op(invalid_region, SkRegion::kUnion_Op); |
} |
-void VideoFrameCapturerHelper::InvalidateScreen(const SkISize& size) { |
+void ScreenCapturerHelper::InvalidateScreen(const SkISize& size) { |
base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
invalid_region_.op(SkIRect::MakeWH(size.width(), size.height()), |
SkRegion::kUnion_Op); |
} |
-void VideoFrameCapturerHelper::InvalidateFullScreen() { |
+void ScreenCapturerHelper::InvalidateFullScreen() { |
if (!size_most_recent_.isZero()) |
InvalidateScreen(size_most_recent_); |
} |
-void VideoFrameCapturerHelper::SwapInvalidRegion(SkRegion* invalid_region) { |
+void ScreenCapturerHelper::SwapInvalidRegion(SkRegion* invalid_region) { |
{ |
base::AutoLock auto_invalid_region_lock(invalid_region_lock_); |
invalid_region->swap(invalid_region_); |
@@ -55,15 +55,15 @@ void VideoFrameCapturerHelper::SwapInvalidRegion(SkRegion* invalid_region) { |
} |
} |
-void VideoFrameCapturerHelper::SetLogGridSize(int log_grid_size) { |
+void ScreenCapturerHelper::SetLogGridSize(int log_grid_size) { |
log_grid_size_ = log_grid_size; |
} |
-const SkISize& VideoFrameCapturerHelper::size_most_recent() const { |
+const SkISize& ScreenCapturerHelper::size_most_recent() const { |
return size_most_recent_; |
} |
-void VideoFrameCapturerHelper::set_size_most_recent(const SkISize& size) { |
+void ScreenCapturerHelper::set_size_most_recent(const SkISize& size) { |
size_most_recent_ = size; |
} |
@@ -79,7 +79,7 @@ static int UpToMultiple(int x, int n, int nMask) { |
return ((x + n - 1) & nMask); |
} |
-scoped_ptr<SkRegion> VideoFrameCapturerHelper::ExpandToGrid( |
+scoped_ptr<SkRegion> ScreenCapturerHelper::ExpandToGrid( |
const SkRegion& region, |
int log_grid_size) { |
DCHECK(log_grid_size >= 1); |
@@ -115,4 +115,4 @@ scoped_ptr<SkRegion> VideoFrameCapturerHelper::ExpandToGrid( |
return regionNew.Pass(); |
} |
-} // namespace remoting |
+} // namespace media |