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

Unified Diff: remoting/base/decoder_vp8.h

Issue 7992011: Move us fully from gfx:: over to skia types for consistency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for bad DEPS Created 9 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
« no previous file with comments | « remoting/base/decoder_row_based.cc ('k') | remoting/base/decoder_vp8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/decoder_vp8.h
diff --git a/remoting/base/decoder_vp8.h b/remoting/base/decoder_vp8.h
index 7aab0fb0db0138589ccef22a0ccfb4a31bf5ebcc..33ec147e2790f61fdd209a062607864171479a32 100644
--- a/remoting/base/decoder_vp8.h
+++ b/remoting/base/decoder_vp8.h
@@ -18,15 +18,16 @@ class DecoderVp8 : public Decoder {
virtual ~DecoderVp8();
// Decoder implementations.
- virtual void Initialize(scoped_refptr<media::VideoFrame> frame);
- virtual DecodeResult DecodePacket(const VideoPacket* packet);
- virtual void GetUpdatedRects(UpdatedRects* rects);
- virtual bool IsReadyForData();
- virtual void Reset();
- virtual VideoPacketFormat::Encoding Encoding();
- virtual void SetScaleRatios(double horizontal_ratio, double vertical_ratio);
- virtual void SetClipRect(const gfx::Rect& clip_rect);
- virtual void RefreshRects(const std::vector<gfx::Rect>& rects);
+ virtual void Initialize(scoped_refptr<media::VideoFrame> frame) OVERRIDE;
+ virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
+ virtual void GetUpdatedRects(RectVector* rects) OVERRIDE;
+ virtual bool IsReadyForData() OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual VideoPacketFormat::Encoding Encoding() OVERRIDE;
+ virtual void SetScaleRatios(double horizontal_ratio,
+ double vertical_ratio) OVERRIDE;
+ virtual void SetClipRect(const SkIRect& clip_rect) OVERRIDE;
+ virtual void RefreshRects(const RectVector& rects) OVERRIDE;
private:
enum State {
@@ -40,14 +41,14 @@ class DecoderVp8 : public Decoder {
// Perform color space conversion on the specified rectangles.
// Write the updated rectangles to |output_rects|.
- void ConvertRects(const UpdatedRects& rects,
- UpdatedRects* output_rects);
+ void ConvertRects(const RectVector& rects,
+ RectVector* output_rects);
// Perform scaling and color space conversion on the specified
// rectangles.
// Write the updated rectangles to |output_rects|.
- void ScaleAndConvertRects(const UpdatedRects& rects,
- UpdatedRects* output_rects);
+ void ScaleAndConvertRects(const RectVector& rects,
+ RectVector* output_rects);
// The internal state of the decoder.
State state_;
@@ -61,10 +62,10 @@ class DecoderVp8 : public Decoder {
vpx_image_t* last_image_;
// Record the updated rects in the last decode.
- UpdatedRects updated_rects_;
+ RectVector updated_rects_;
// Clipping rect for the output of the decoder.
- gfx::Rect clip_rect_;
+ SkIRect clip_rect_;
// Scale factors of the decoded output.
double horizontal_scale_ratio_;
« no previous file with comments | « remoting/base/decoder_row_based.cc ('k') | remoting/base/decoder_vp8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698