| Index: remoting/codec/video_decoder.h
|
| diff --git a/remoting/codec/video_decoder.h b/remoting/codec/video_decoder.h
|
| index 4730d3aebb05056e93c78f848490da291741d2b2..83197b8c9da41f851ef184c15c932e83b7f78af3 100644
|
| --- a/remoting/codec/video_decoder.h
|
| +++ b/remoting/codec/video_decoder.h
|
| @@ -7,9 +7,12 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "remoting/proto/video.pb.h"
|
| -#include "third_party/skia/include/core/SkRect.h"
|
| -#include "third_party/skia/include/core/SkRegion.h"
|
| -#include "third_party/skia/include/core/SkSize.h"
|
| +
|
| +namespace webrtc {
|
| +class DesktopRect;
|
| +class DesktopRegion;
|
| +class DesktopSize;
|
| +} // namespace webrtc
|
|
|
| namespace remoting {
|
|
|
| @@ -31,7 +34,7 @@ class VideoDecoder {
|
|
|
| // Initializes the decoder and sets the output dimensions.
|
| // |screen size| must not be empty.
|
| - virtual void Initialize(const SkISize& screen_size) = 0;
|
| + virtual void Initialize(const webrtc::DesktopSize& screen_size) = 0;
|
|
|
| // Feeds more data into the decoder.
|
| virtual DecodeResult DecodePacket(const VideoPacket* packet) = 0;
|
| @@ -44,8 +47,8 @@ class VideoDecoder {
|
| // Marks the specified |region| of the view for update the next time
|
| // RenderFrame() is called. |region| is expressed in |view_size| coordinates.
|
| // |view_size| must not be empty.
|
| - virtual void Invalidate(const SkISize& view_size,
|
| - const SkRegion& region) = 0;
|
| + virtual void Invalidate(const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRegion& region) = 0;
|
|
|
| // Copies invalidated pixels within |clip_area| to |image_buffer|. Pixels are
|
| // invalidated either by new data received in DecodePacket(), or by explicit
|
| @@ -59,15 +62,15 @@ class VideoDecoder {
|
| //
|
| // On return, |output_region| contains the updated area, in |view_size|
|
| // coordinates.
|
| - virtual void RenderFrame(const SkISize& view_size,
|
| - const SkIRect& clip_area,
|
| + virtual void RenderFrame(const webrtc::DesktopSize& view_size,
|
| + const webrtc::DesktopRect& clip_area,
|
| uint8* image_buffer,
|
| int image_stride,
|
| - SkRegion* output_region) = 0;
|
| + webrtc::DesktopRegion* output_region) = 0;
|
|
|
| // Returns the "shape", if any, of the most recently rendered frame.
|
| // The shape is returned in source dimensions.
|
| - virtual const SkRegion* GetImageShape() = 0;
|
| + virtual const webrtc::DesktopRegion* GetImageShape() = 0;
|
| };
|
|
|
| } // namespace remoting
|
|
|