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

Side by Side Diff: remoting/codec/video_decoder_verbatim.h

Issue 11195029: Remove ZLib codec support from chromoting host and client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/codec/video_decoder_row_based.cc ('k') | remoting/codec/video_decoder_verbatim.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_ROW_BASED_H_ 5 #ifndef REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_
6 #define REMOTING_CODEC_VIDEO_DECODER_ROW_BASED_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 11
12 namespace remoting { 12 namespace remoting {
13 13
14 class Decompressor; 14 // Video decoder implementations that decodes video packet encoded by
15 // VideoEncoderVerbatim. It just copies data from incoming packets to the
16 // video frames.
17 class VideoDecoderVerbatim : public VideoDecoder {
18 public:
19 virtual ~VideoDecoderVerbatim();
15 20
16 class VideoDecoderRowBased : public VideoDecoder { 21 VideoDecoderVerbatim();
17 public:
18 virtual ~VideoDecoderRowBased();
19
20 static VideoDecoderRowBased* CreateZlibDecoder();
21 static VideoDecoderRowBased* CreateVerbatimDecoder();
22 22
23 // VideoDecoder implementation. 23 // VideoDecoder implementation.
24 virtual bool IsReadyForData() OVERRIDE; 24 virtual bool IsReadyForData() OVERRIDE;
25 virtual void Initialize(const SkISize& screen_size) OVERRIDE; 25 virtual void Initialize(const SkISize& screen_size) OVERRIDE;
26 virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE; 26 virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE;
27 virtual VideoPacketFormat::Encoding Encoding() OVERRIDE; 27 virtual VideoPacketFormat::Encoding Encoding() OVERRIDE;
28 virtual void Invalidate(const SkISize& view_size, 28 virtual void Invalidate(const SkISize& view_size,
29 const SkRegion& region) OVERRIDE; 29 const SkRegion& region) OVERRIDE;
30 virtual void RenderFrame(const SkISize& view_size, 30 virtual void RenderFrame(const SkISize& view_size,
31 const SkIRect& clip_area, 31 const SkIRect& clip_area,
32 uint8* image_buffer, 32 uint8* image_buffer,
33 int image_stride, 33 int image_stride,
34 SkRegion* output_region) OVERRIDE; 34 SkRegion* output_region) OVERRIDE;
35 35
36 private: 36 private:
37 enum State { 37 enum State {
38 kUninitialized, 38 kUninitialized,
39 kReady, 39 kReady,
40 kProcessing, 40 kProcessing,
41 kPartitionDone, 41 kPartitionDone,
42 kDone, 42 kDone,
43 kError, 43 kError,
44 }; 44 };
45 45
46 VideoDecoderRowBased(Decompressor* decompressor,
47 VideoPacketFormat::Encoding encoding);
48
49 // Helper method. Called from DecodePacket to updated state of the decoder. 46 // Helper method. Called from DecodePacket to updated state of the decoder.
50 void UpdateStateForPacket(const VideoPacket* packet); 47 void UpdateStateForPacket(const VideoPacket* packet);
51 48
52 // The internal state of the decoder. 49 // The internal state of the decoder.
53 State state_; 50 State state_;
54 51
55 // Keeps track of the updating rect. 52 // Keeps track of the updating rect.
56 SkIRect clip_; 53 SkIRect clip_;
57 54
58 // The compression for the input byte stream.
59 scoped_ptr<Decompressor> decompressor_;
60
61 // The encoding of the incoming stream.
62 VideoPacketFormat::Encoding encoding_;
63
64 // The position in the row that we are updating. 55 // The position in the row that we are updating.
65 int row_pos_; 56 int row_pos_;
66 57
67 // The current row in the rect that we are updaing. 58 // The current row in the rect that we are updaing.
68 int row_y_; 59 int row_y_;
69 60
70 // The region updated that hasn't been copied to the screen yet. 61 // The region updated that hasn't been copied to the screen yet.
71 SkRegion updated_region_; 62 SkRegion updated_region_;
72 63
73 // Size of the remote screen. 64 // Size of the remote screen.
74 SkISize screen_size_; 65 SkISize screen_size_;
75 66
76 // The bitmap holding the remote screen bits. 67 // The bitmap holding the remote screen bits.
77 scoped_array<uint8> screen_buffer_; 68 scoped_array<uint8> screen_buffer_;
78 69
79 DISALLOW_COPY_AND_ASSIGN(VideoDecoderRowBased); 70 DISALLOW_COPY_AND_ASSIGN(VideoDecoderVerbatim);
80 }; 71 };
81 72
82 } // namespace remoting 73 } // namespace remoting
83 74
84 #endif // REMOTING_CODEC_VIDEO_DECODER_ROW_BASED_H_ 75 #endif // REMOTING_CODEC_VIDEO_DECODER_VERBATIM_H_
OLDNEW
« no previous file with comments | « remoting/codec/video_decoder_row_based.cc ('k') | remoting/codec/video_decoder_verbatim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698