| Index: media/video/capture/screen/screen_capturer_fake.h
|
| diff --git a/remoting/capturer/video_frame_capturer_fake.h b/media/video/capture/screen/screen_capturer_fake.h
|
| similarity index 54%
|
| rename from remoting/capturer/video_frame_capturer_fake.h
|
| rename to media/video/capture/screen/screen_capturer_fake.h
|
| index b116967068942585c032fa464a3d1cef88fc8073..11daad49e301b85823ddf6a87e4d0fcd8dc71ce5 100644
|
| --- a/remoting/capturer/video_frame_capturer_fake.h
|
| +++ b/media/video/capture/screen/screen_capturer_fake.h
|
| @@ -2,29 +2,29 @@
|
| // 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_FAKE_H_
|
| -#define REMOTING_CAPTURER_VIDEO_FRAME_CAPTURER_FAKE_H_
|
| +#ifndef MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_FAKE_H_
|
| +#define MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_FAKE_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "remoting/capturer/video_frame_capturer.h"
|
| -#include "remoting/capturer/video_frame_capturer_helper.h"
|
| +#include "media/base/media_export.h"
|
| +#include "media/video/capture/screen/screen_capturer.h"
|
| +#include "media/video/capture/screen/screen_capturer_helper.h"
|
|
|
| -namespace remoting {
|
| +namespace media {
|
|
|
| -// A VideoFrameCapturerFake generates artificial image for testing purpose.
|
| +// A ScreenCapturerFake generates artificial image for testing purpose.
|
| //
|
| -// VideoFrameCapturerFake is double-buffered as required by VideoFrameCapturer.
|
| -// See remoting/host/video_frame_capturer.h.
|
| -class VideoFrameCapturerFake : public VideoFrameCapturer {
|
| +// ScreenCapturerFake is double-buffered as required by ScreenCapturer.
|
| +class MEDIA_EXPORT ScreenCapturerFake : public ScreenCapturer {
|
| public:
|
| - // VideoFrameCapturerFake generates a picture of size kWidth x kHeight.
|
| + // ScreenCapturerFake generates a picture of size kWidth x kHeight.
|
| static const int kWidth = 800;
|
| static const int kHeight = 600;
|
|
|
| - VideoFrameCapturerFake();
|
| - virtual ~VideoFrameCapturerFake();
|
| + ScreenCapturerFake();
|
| + virtual ~ScreenCapturerFake();
|
|
|
| - // Overridden from VideoFrameCapturer:
|
| + // Overridden from ScreenCapturer:
|
| virtual void Start(Delegate* delegate) OVERRIDE;
|
| virtual void Stop() OVERRIDE;
|
| virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE;
|
| @@ -46,7 +46,7 @@ class VideoFrameCapturerFake : public VideoFrameCapturer {
|
| int box_speed_x_;
|
| int box_speed_y_;
|
|
|
| - VideoFrameCapturerHelper helper_;
|
| + ScreenCapturerHelper helper_;
|
|
|
| // We have two buffers for the screen images as required by Capturer.
|
| static const int kNumBuffers = 2;
|
| @@ -55,9 +55,9 @@ class VideoFrameCapturerFake : public VideoFrameCapturer {
|
| // The current buffer with valid data for reading.
|
| int current_buffer_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(VideoFrameCapturerFake);
|
| + DISALLOW_COPY_AND_ASSIGN(ScreenCapturerFake);
|
| };
|
|
|
| -} // namespace remoting
|
| +} // namespace media
|
|
|
| -#endif // REMOTING_CAPTURER_VIDEO_FRAME_CAPTURER_FAKE_H_
|
| +#endif // MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURER_FAKE_H_
|
|
|