OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ | 5 #ifndef REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ |
6 #define REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ | 6 #define REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "remoting/codec/video_decoder.h" | 10 #include "remoting/codec/video_decoder.h" |
| 11 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| 12 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" |
11 | 13 |
12 namespace remoting { | 14 namespace remoting { |
13 | 15 |
14 // Video decoder implementations that decodes video packet encoded by | 16 // Video decoder implementations that decodes video packet encoded by |
15 // VideoEncoderVerbatim. It just copies data from incoming packets to the | 17 // VideoEncoderVerbatim. It just copies data from incoming packets to the |
16 // video frames. | 18 // video frames. |
17 class VideoDecoderVerbatim : public VideoDecoder { | 19 class VideoDecoderVerbatim : public VideoDecoder { |
18 public: | 20 public: |
19 virtual ~VideoDecoderVerbatim(); | 21 virtual ~VideoDecoderVerbatim(); |
20 | 22 |
21 VideoDecoderVerbatim(); | 23 VideoDecoderVerbatim(); |
22 | 24 |
23 // VideoDecoder implementation. | 25 // VideoDecoder implementation. |
24 virtual void Initialize(const SkISize& screen_size) OVERRIDE; | 26 virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE; |
25 virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE; | 27 virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE; |
26 virtual void Invalidate(const SkISize& view_size, | 28 virtual void Invalidate(const webrtc::DesktopSize& view_size, |
27 const SkRegion& region) OVERRIDE; | 29 const webrtc::DesktopRegion& region) OVERRIDE; |
28 virtual void RenderFrame(const SkISize& view_size, | 30 virtual void RenderFrame(const webrtc::DesktopSize& view_size, |
29 const SkIRect& clip_area, | 31 const webrtc::DesktopRect& clip_area, |
30 uint8* image_buffer, | 32 uint8* image_buffer, |
31 int image_stride, | 33 int image_stride, |
32 SkRegion* output_region) OVERRIDE; | 34 webrtc::DesktopRegion* output_region) OVERRIDE; |
33 virtual const SkRegion* GetImageShape() OVERRIDE; | 35 virtual const webrtc::DesktopRegion* GetImageShape() OVERRIDE; |
34 | 36 |
35 private: | 37 private: |
36 // The region updated that hasn't been copied to the screen yet. | 38 // The region updated that hasn't been copied to the screen yet. |
37 SkRegion updated_region_; | 39 webrtc::DesktopRegion updated_region_; |
38 | 40 |
39 // Size of the remote screen. | 41 // Size of the remote screen. |
40 SkISize screen_size_; | 42 webrtc::DesktopSize screen_size_; |
41 | 43 |
42 // The bitmap holding the remote screen bits. | 44 // The bitmap holding the remote screen bits. |
43 scoped_ptr<uint8[]> screen_buffer_; | 45 scoped_ptr<uint8[]> screen_buffer_; |
44 | 46 |
45 DISALLOW_COPY_AND_ASSIGN(VideoDecoderVerbatim); | 47 DISALLOW_COPY_AND_ASSIGN(VideoDecoderVerbatim); |
46 }; | 48 }; |
47 | 49 |
48 } // namespace remoting | 50 } // namespace remoting |
49 | 51 |
50 #endif // REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ | 52 #endif // REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_ |
OLD | NEW |