Index: trunk/src/remoting/codec/video_decoder_vp8.h |
=================================================================== |
--- trunk/src/remoting/codec/video_decoder_vp8.h (revision 224204) |
+++ trunk/src/remoting/codec/video_decoder_vp8.h (working copy) |
@@ -7,8 +7,6 @@ |
#include "base/compiler_specific.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" |
typedef struct vpx_codec_ctx vpx_codec_ctx_t; |
typedef struct vpx_image vpx_image_t; |
@@ -21,18 +19,18 @@ |
virtual ~VideoDecoderVp8(); |
// VideoDecoder implementations. |
- virtual bool IsReadyForData() OVERRIDE; |
- virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE; |
+ virtual void Initialize(const SkISize& screen_size) OVERRIDE; |
virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE; |
+ virtual bool IsReadyForData() OVERRIDE; |
virtual VideoPacketFormat::Encoding Encoding() OVERRIDE; |
- 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, |
+ virtual void Invalidate(const SkISize& view_size, |
+ const SkRegion& region) OVERRIDE; |
+ virtual void RenderFrame(const SkISize& view_size, |
+ const SkIRect& clip_area, |
uint8* image_buffer, |
int image_stride, |
- webrtc::DesktopRegion* output_region) OVERRIDE; |
- virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE; |
+ SkRegion* output_region) OVERRIDE; |
+ virtual const SkRegion* GetImageShape() OVERRIDE; |
private: |
enum State { |
@@ -42,14 +40,12 @@ |
}; |
// Fills the rectangle |rect| with the given ARGB color |color| in |buffer|. |
- void FillRect(uint8* buffer, int stride, |
- const webrtc::DesktopRect& rect, |
- uint32 color); |
+ void FillRect(uint8* buffer, int stride, const SkIRect& rect, uint32 color); |
// Calculates the difference between the desktop shape regions in two |
// consecutive frames and updates |updated_region_| and |transparent_region_| |
// accordingly. |
- void UpdateImageShapeRegion(webrtc::DesktopRegion* new_desktop_shape); |
+ void UpdateImageShapeRegion(SkRegion* new_desktop_shape); |
// The internal state of the decoder. |
State state_; |
@@ -60,16 +56,16 @@ |
vpx_image_t* last_image_; |
// The region updated that hasn't been copied to the screen yet. |
- webrtc::DesktopRegion updated_region_; |
+ SkRegion updated_region_; |
// Output dimensions. |
- webrtc::DesktopSize screen_size_; |
+ SkISize screen_size_; |
// The region occupied by the top level windows. |
- webrtc::DesktopRegion desktop_shape_; |
+ SkRegion desktop_shape_; |
// The region that should be make transparent. |
- webrtc::DesktopRegion transparent_region_; |
+ SkRegion transparent_region_; |
DISALLOW_COPY_AND_ASSIGN(VideoDecoderVp8); |
}; |