| Index: media/video/capture/screen/screen_capture_frame.h
|
| diff --git a/remoting/capturer/video_frame.h b/media/video/capture/screen/screen_capture_frame.h
|
| similarity index 77%
|
| rename from remoting/capturer/video_frame.h
|
| rename to media/video/capture/screen/screen_capture_frame.h
|
| index 77105b78fbcd74a055d883acd44833a29dae0961..090501e5aca27ba1d59cc07e8328e59e44e29c5a 100644
|
| --- a/remoting/capturer/video_frame.h
|
| +++ b/media/video/capture/screen/screen_capture_frame.h
|
| @@ -2,22 +2,23 @@
|
| // 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_H_
|
| -#define REMOTING_CAPTURER_VIDEO_FRAME_H_
|
| +#ifndef MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURE_FRAME_H_
|
| +#define MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURE_FRAME_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "remoting/capturer/shared_buffer.h"
|
| +#include "media/base/media_export.h"
|
| +#include "media/video/capture/screen/shared_buffer.h"
|
| #include "third_party/skia/include/core/SkSize.h"
|
| #include "third_party/skia/include/core/SkTypes.h"
|
|
|
| -namespace remoting {
|
| +namespace media {
|
|
|
| // Represents a video frame.
|
| -class VideoFrame {
|
| +class MEDIA_EXPORT ScreenCaptureFrame {
|
| public:
|
| - virtual ~VideoFrame();
|
| + virtual ~ScreenCaptureFrame();
|
|
|
| int bytes_per_row() const { return bytes_per_row_; }
|
| const SkISize& dimensions() const { return dimensions_; }
|
| @@ -30,7 +31,7 @@ class VideoFrame {
|
| // Initializes an empty video frame. Derived classes are expected to allocate
|
| // memory for the frame in a platform-specific way and set the properties of
|
| // the allocated frame.
|
| - VideoFrame();
|
| + ScreenCaptureFrame();
|
|
|
| void set_bytes_per_row(int bytes_per_row) {
|
| bytes_per_row_ = bytes_per_row;
|
| @@ -55,9 +56,9 @@ class VideoFrame {
|
| // Points to an optional shared memory buffer that backs up |pixels_| buffer.
|
| scoped_refptr<SharedBuffer> shared_buffer_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(VideoFrame);
|
| + DISALLOW_COPY_AND_ASSIGN(ScreenCaptureFrame);
|
| };
|
|
|
| -} // namespace remoting
|
| +} // namespace media
|
|
|
| -#endif // REMOTING_CAPTURER_VIDEO_FRAME_H_
|
| +#endif // MEDIA_VIDEO_CAPTURE_SCREEN_SCREEN_CAPTURE_FRAME_H_
|
|
|