OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "remoting/client/plugin/pepper_view.h" | 5 #include "remoting/client/plugin/pepper_view.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "remoting/base/decoder_verbatim.h" | 8 #include "remoting/base/decoder_zlib.h" |
9 #include "remoting/client/plugin/chromoting_plugin.h" | 9 #include "remoting/client/plugin/chromoting_plugin.h" |
10 #include "remoting/client/plugin/pepper_util.h" | 10 #include "remoting/client/plugin/pepper_util.h" |
11 #include "third_party/ppapi/cpp/device_context_2d.h" | 11 #include "third_party/ppapi/cpp/device_context_2d.h" |
12 #include "third_party/ppapi/cpp/image_data.h" | 12 #include "third_party/ppapi/cpp/image_data.h" |
13 #include "third_party/ppapi/cpp/point.h" | 13 #include "third_party/ppapi/cpp/point.h" |
14 #include "third_party/ppapi/cpp/size.h" | 14 #include "third_party/ppapi/cpp/size.h" |
15 | 15 |
16 namespace remoting { | 16 namespace remoting { |
17 | 17 |
18 PepperView::PepperView(ChromotingPlugin* plugin) | 18 PepperView::PepperView(ChromotingPlugin* plugin) |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream, | 143 NewRunnableMethod(this, &PepperView::HandleBeginUpdateStream, |
144 msg)); | 144 msg)); |
145 return; | 145 return; |
146 } | 146 } |
147 | 147 |
148 scoped_ptr<HostMessage> deleter(msg); | 148 scoped_ptr<HostMessage> deleter(msg); |
149 | 149 |
150 // TODO(hclam): Use the information from the message to create the decoder. | 150 // TODO(hclam): Use the information from the message to create the decoder. |
151 // We lazily construct the decoder. | 151 // We lazily construct the decoder. |
152 if (!decoder_.get()) { | 152 if (!decoder_.get()) { |
153 decoder_.reset(new DecoderVerbatim()); | 153 decoder_.reset(new DecoderZlib()); |
154 } | 154 } |
155 | 155 |
156 if (!frame_) { | 156 if (!frame_) { |
157 media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, | 157 media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, |
158 backing_store_width_, | 158 backing_store_width_, |
159 backing_store_height_, | 159 backing_store_height_, |
160 base::TimeDelta(), base::TimeDelta(), | 160 base::TimeDelta(), base::TimeDelta(), |
161 &frame_); | 161 &frame_); |
162 } | 162 } |
163 | 163 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 update_rects_.begin(), update_rects_.end()); | 202 update_rects_.begin(), update_rects_.end()); |
203 Paint(); | 203 Paint(); |
204 // TODO(ajwong): Need to block here to be synchronous. | 204 // TODO(ajwong): Need to block here to be synchronous. |
205 } | 205 } |
206 | 206 |
207 | 207 |
208 void PepperView::OnDecodeDone() { | 208 void PepperView::OnDecodeDone() { |
209 } | 209 } |
210 | 210 |
211 } // namespace remoting | 211 } // namespace remoting |
OLD | NEW |