| Index: media/video/capture/screen/screen_capture_data.h
|
| diff --git a/remoting/capturer/capture_data.h b/media/video/capture/screen/screen_capture_data.h
|
| similarity index 79%
|
| rename from remoting/capturer/capture_data.h
|
| rename to media/video/capture/screen/screen_capture_data.h
|
| index a68ebe843ac43d504701063105f913b50a396ca7..c5e4a0979fed1649823b213700adfb8c95302e57 100644
|
| --- a/remoting/capturer/capture_data.h
|
| +++ b/media/video/capture/screen/screen_capture_data.h
|
| @@ -2,28 +2,30 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_CAPTURER_CAPTURE_DATA_H_
|
| -#define REMOTING_CAPTURER_CAPTURE_DATA_H_
|
| +#ifndef MEDIA_VIDEO_CAPTURE_SCREEN_CAPTURE_DATA_H_
|
| +#define MEDIA_VIDEO_CAPTURE_SCREEN_CAPTURE_DATA_H_
|
|
|
| #include <vector>
|
|
|
| #include "base/basictypes.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/SkRegion.h"
|
|
|
| -namespace remoting {
|
| +namespace media {
|
|
|
| class SharedBuffer;
|
|
|
| // Stores the data and information of a capture to pass off to the
|
| // encoding thread.
|
| -class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
| +class MEDIA_EXPORT ScreenCaptureData
|
| + : public base::RefCountedThreadSafe<ScreenCaptureData> {
|
| public:
|
| // 32 bit RGB is 4 bytes per pixel.
|
| static const int kBytesPerPixel = 4;
|
|
|
| - CaptureData(uint8* data, int stride, const SkISize& size);
|
| + ScreenCaptureData(uint8* data, int stride, const SkISize& size);
|
|
|
| // Data buffer.
|
| uint8* data() const { return data_; }
|
| @@ -66,8 +68,8 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
| }
|
|
|
| private:
|
| - friend class base::RefCountedThreadSafe<CaptureData>;
|
| - virtual ~CaptureData();
|
| + friend class base::RefCountedThreadSafe<ScreenCaptureData>;
|
| + virtual ~ScreenCaptureData();
|
|
|
| uint8* data_;
|
| int stride_;
|
| @@ -86,6 +88,6 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
|
| scoped_refptr<SharedBuffer> shared_buffer_;
|
| };
|
|
|
| -} // namespace remoting
|
| +} // namespace media
|
|
|
| -#endif // REMOTING_CAPTURER_CAPTURE_DATA_H_
|
| +#endif // MEDIA_VIDEO_CAPTURE_SCREEN_CAPTURE_DATA_H_
|
|
|