Index: media/video/capture/screen/screen_capturer.h |
diff --git a/remoting/capturer/video_frame_capturer.h b/media/video/capture/screen/screen_capturer.h |
similarity index 81% |
rename from remoting/capturer/video_frame_capturer.h |
rename to media/video/capture/screen/screen_capturer.h |
index f16616bc8085c9d867a5e5fa64dbfbe719715b03..23936d038d62b6db608c97ddf6a6c23627eb5014 100644 |
--- a/remoting/capturer/video_frame_capturer.h |
+++ b/media/video/capture/screen/screen_capturer.h |
@@ -2,17 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef REMOTING_CAPTURER_VIDEO_FRAME_CAPTURER_H_ |
-#define REMOTING_CAPTURER_VIDEO_FRAME_CAPTURER_H_ |
+#ifndef MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_H_ |
+#define MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_H_ |
#include "base/basictypes.h" |
#include "base/callback.h" |
#include "base/shared_memory.h" |
+#include "media/base/media_export.h" |
#include "third_party/skia/include/core/SkRegion.h" |
-namespace remoting { |
+namespace media { |
-class CaptureData; |
+class ScreenCaptureData; |
struct MouseCursorShape; |
class SharedBufferFactory; |
@@ -46,7 +47,7 @@ class SharedBufferFactory; |
// Implementation has to ensure the following guarantees: |
// 1. Double buffering |
// Since data can be read while another capture action is happening. |
-class VideoFrameCapturer { |
+class MEDIA_EXPORT ScreenCapturer { |
public: |
// Provides callbacks used by the capturer to pass captured video frames and |
// mouse cursor shapes to the processing pipeline. |
@@ -57,7 +58,7 @@ class VideoFrameCapturer { |
// Called when a video frame has been captured. |capture_data| describes |
// a captured frame. |
virtual void OnCaptureCompleted( |
- scoped_refptr<CaptureData> capture_data) = 0; |
+ scoped_refptr<ScreenCaptureData> capture_data) = 0; |
// Called when the cursor shape has changed. |
// TODO(sergeyu): Move cursor shape capturing to a separate class. |
@@ -65,26 +66,26 @@ class VideoFrameCapturer { |
scoped_ptr<MouseCursorShape> cursor_shape) = 0; |
}; |
- virtual ~VideoFrameCapturer() {} |
+ virtual ~ScreenCapturer() {} |
// Create platform-specific capturer. |
- static scoped_ptr<VideoFrameCapturer> Create(); |
+ static scoped_ptr<ScreenCapturer> Create(); |
// Create platform-specific capturer that uses shared memory buffers. |
- static scoped_ptr<VideoFrameCapturer> CreateWithFactory( |
+ static scoped_ptr<ScreenCapturer> CreateWithFactory( |
SharedBufferFactory* shared_buffer_factory); |
#if defined(OS_LINUX) |
- // Set whether the VideoFrameCapturer should try to use X DAMAGE support if it |
- // is available. This needs to be called before the VideoFrameCapturer is |
+ // Set whether the ScreenCapturer should try to use X DAMAGE support if it |
+ // is available. This needs to be called before the ScreenCapturer is |
// created. |
// This is used by the Virtual Me2Me host, since the XDamage extension is |
// known to work reliably in this case. |
// TODO(lambroslambrou): This currently sets a global flag, referenced during |
- // VideoFrameCapturer::Create(). This is a temporary solution, until the |
+ // ScreenCapturer::Create(). This is a temporary solution, until the |
// DesktopEnvironment class is refactored to allow applications to control |
- // the creation of various stubs (including the VideoFrameCapturer) - see |
+ // the creation of various stubs (including the ScreenCapturer) - see |
// http://crbug.com/104544 |
static void EnableXDamage(bool enable); |
#endif // defined(OS_LINUX) |
@@ -109,6 +110,6 @@ class VideoFrameCapturer { |
virtual void CaptureFrame() = 0; |
}; |
-} // namespace remoting |
+} // namespace media |
-#endif // REMOTING_CAPTURER_VIDEO_FRAME_CAPTURER_H_ |
+#endif // MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_H_ |