| 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 #include "remoting/client/plugin/pepper_video_renderer_2d.h" | 5 #include "remoting/client/plugin/pepper_video_renderer_2d.h" |
| 6 | 6 |
| 7 #include <functional> | 7 #include <functional> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } | 187 } |
| 188 | 188 |
| 189 ChromotingStats* PepperVideoRenderer2D::GetStats() { | 189 ChromotingStats* PepperVideoRenderer2D::GetStats() { |
| 190 DCHECK(CalledOnValidThread()); | 190 DCHECK(CalledOnValidThread()); |
| 191 | 191 |
| 192 return software_video_renderer_->GetStats(); | 192 return software_video_renderer_->GetStats(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void PepperVideoRenderer2D::ProcessVideoPacket( | 195 void PepperVideoRenderer2D::ProcessVideoPacket( |
| 196 scoped_ptr<VideoPacket> video_packet, | 196 scoped_ptr<VideoPacket> video_packet, |
| 197 const base::Closure& done) { | 197 const ProgressCallback& progress_callback) { |
| 198 DCHECK(CalledOnValidThread()); | 198 DCHECK(CalledOnValidThread()); |
| 199 | 199 |
| 200 software_video_renderer_->ProcessVideoPacket(video_packet.Pass(), done); | 200 software_video_renderer_->ProcessVideoPacket(video_packet.Pass(), |
| 201 progress_callback); |
| 201 } | 202 } |
| 202 | 203 |
| 203 void PepperVideoRenderer2D::ApplyBuffer(const webrtc::DesktopSize& view_size, | 204 void PepperVideoRenderer2D::ApplyBuffer(const webrtc::DesktopSize& view_size, |
| 204 const webrtc::DesktopRect& clip_area, | 205 const webrtc::DesktopRect& clip_area, |
| 205 webrtc::DesktopFrame* buffer, | 206 webrtc::DesktopFrame* buffer, |
| 206 const webrtc::DesktopRegion& region, | 207 const webrtc::DesktopRegion& region, |
| 207 const webrtc::DesktopRegion& shape) { | 208 const webrtc::DesktopRegion& shape) { |
| 208 DCHECK(CalledOnValidThread()); | 209 DCHECK(CalledOnValidThread()); |
| 209 | 210 |
| 210 if (!frame_received_) { | 211 if (!frame_received_) { |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 | 357 |
| 357 // If there is a buffer queued for rendering then render it now. | 358 // If there is a buffer queued for rendering then render it now. |
| 358 if (merge_buffer_) { | 359 if (merge_buffer_) { |
| 359 buffer = merge_buffer_; | 360 buffer = merge_buffer_; |
| 360 merge_buffer_ = nullptr; | 361 merge_buffer_ = nullptr; |
| 361 FlushBuffer(merge_clip_area_, buffer, merge_region_); | 362 FlushBuffer(merge_clip_area_, buffer, merge_region_); |
| 362 } | 363 } |
| 363 } | 364 } |
| 364 | 365 |
| 365 } // namespace remoting | 366 } // namespace remoting |
| OLD | NEW |