diff options
Diffstat (limited to 'remoting/codec/video_decoder_verbatim.h')
-rw-r--r-- | remoting/codec/video_decoder_verbatim.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/remoting/codec/video_decoder_verbatim.h b/remoting/codec/video_decoder_verbatim.h index fa783dd..24203d9 100644 --- a/remoting/codec/video_decoder_verbatim.h +++ b/remoting/codec/video_decoder_verbatim.h @@ -8,6 +8,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "remoting/codec/video_decoder.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_region.h" namespace remoting { @@ -21,23 +23,23 @@ class VideoDecoderVerbatim : public VideoDecoder { VideoDecoderVerbatim(); // VideoDecoder implementation. - virtual void Initialize(const SkISize& screen_size) OVERRIDE; + virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE; virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE; - virtual void Invalidate(const SkISize& view_size, - const SkRegion& region) OVERRIDE; - virtual void RenderFrame(const SkISize& view_size, - const SkIRect& clip_area, + virtual void Invalidate(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRegion& region) OVERRIDE; + virtual void RenderFrame(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRect& clip_area, uint8* image_buffer, int image_stride, - SkRegion* output_region) OVERRIDE; - virtual const SkRegion* GetImageShape() OVERRIDE; + webrtc::DesktopRegion* output_region) OVERRIDE; + virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE; private: // The region updated that hasn't been copied to the screen yet. - SkRegion updated_region_; + webrtc::DesktopRegion updated_region_; // Size of the remote screen. - SkISize screen_size_; + webrtc::DesktopSize screen_size_; // The bitmap holding the remote screen bits. scoped_ptr<uint8[]> screen_buffer_; |