Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: remoting/codec/video_decoder_vp8.h

Issue 23440046: Remove dependency on Skia from chromoting client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/codec/video_decoder_vp8.h
diff --git a/remoting/codec/video_decoder_vp8.h b/remoting/codec/video_decoder_vp8.h
index 2efbd223c05396eea0878c1a3a369067a592401e..719ae7744cdba8baff03115a93e35b08395c9341 100644
--- a/remoting/codec/video_decoder_vp8.h
+++ b/remoting/codec/video_decoder_vp8.h
@@ -7,6 +7,8 @@
#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;
@@ -19,18 +21,18 @@ class VideoDecoderVp8 : public VideoDecoder {
virtual ~VideoDecoderVp8();
// VideoDecoder implementations.
- virtual void Initialize(const SkISize& screen_size) OVERRIDE;
- virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
virtual bool IsReadyForData() OVERRIDE;
+ virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
+ virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
virtual VideoPacketFormat::Encoding Encoding() 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:
enum State {
@@ -40,12 +42,14 @@ class VideoDecoderVp8 : public VideoDecoder {
};
// Fills the rectangle |rect| with the given ARGB color |color| in |buffer|.
- void FillRect(uint8* buffer, int stride, const SkIRect& rect, uint32 color);
+ void FillRect(uint8* buffer, int stride,
+ const webrtc::DesktopRect& 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(SkRegion* new_desktop_shape);
+ void UpdateImageShapeRegion(webrtc::DesktopRegion* new_desktop_shape);
// The internal state of the decoder.
State state_;
@@ -56,16 +60,16 @@ class VideoDecoderVp8 : public VideoDecoder {
vpx_image_t* last_image_;
// The region updated that hasn't been copied to the screen yet.
- SkRegion updated_region_;
+ webrtc::DesktopRegion updated_region_;
// Output dimensions.
- SkISize screen_size_;
+ webrtc::DesktopSize screen_size_;
// The region occupied by the top level windows.
- SkRegion desktop_shape_;
+ webrtc::DesktopRegion desktop_shape_;
// The region that should be make transparent.
- SkRegion transparent_region_;
+ webrtc::DesktopRegion transparent_region_;
DISALLOW_COPY_AND_ASSIGN(VideoDecoderVp8);
};

Powered by Google App Engine
This is Rietveld 408576698