| Index: remoting/base/decoder_vp8.h
|
| diff --git a/remoting/base/decoder_vp8.h b/remoting/base/decoder_vp8.h
|
| index 0549f03183002acbefef700bf6c4035863415b82..c316ba88e5009c394aca40430a1a3900226bdbca 100644
|
| --- a/remoting/base/decoder_vp8.h
|
| +++ b/remoting/base/decoder_vp8.h
|
| @@ -18,15 +18,17 @@ class DecoderVp8 : public Decoder {
|
| virtual ~DecoderVp8();
|
|
|
| // Decoder implementations.
|
| - virtual void Initialize(scoped_refptr<media::VideoFrame> frame) OVERRIDE;
|
| + virtual void Initialize(const SkISize& screen_size) OVERRIDE;
|
| virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
|
| - virtual void GetUpdatedRegion(SkRegion* region) OVERRIDE;
|
| virtual bool IsReadyForData() OVERRIDE;
|
| - virtual void Reset() OVERRIDE;
|
| virtual VideoPacketFormat::Encoding Encoding() OVERRIDE;
|
| - virtual void SetOutputSize(const SkISize& size) OVERRIDE;
|
| - virtual void SetClipRect(const SkIRect& clip_rect) OVERRIDE;
|
| - virtual void RefreshRegion(const SkRegion& region) OVERRIDE;
|
| + 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,
|
| + SkRegion* output_region) OVERRIDE;
|
|
|
| private:
|
| enum State {
|
| @@ -38,22 +40,16 @@ class DecoderVp8 : public Decoder {
|
| // The internal state of the decoder.
|
| State state_;
|
|
|
| - // The video frame to write to.
|
| - scoped_refptr<media::VideoFrame> frame_;
|
| -
|
| vpx_codec_ctx_t* codec_;
|
|
|
| // Pointer to the last decoded image.
|
| vpx_image_t* last_image_;
|
|
|
| - // The region updated by the most recent decode.
|
| + // The region updated that hasn't been copied to the screen yet.
|
| SkRegion updated_region_;
|
|
|
| - // Clipping rect for the output of the decoder.
|
| - SkIRect clip_rect_;
|
| -
|
| // Output dimensions.
|
| - SkISize output_size_;
|
| + SkISize screen_size_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DecoderVp8);
|
| };
|
|
|