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

Side by Side Diff: remoting/client/plugin/pepper_video_renderer_2d.cc

Issue 910343002: Decompose VideoRenderer from VideoStub. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix perf test Created 5 years, 10 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
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 #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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 software_video_renderer_->OnSessionConfig(config); 185 software_video_renderer_->OnSessionConfig(config);
186 AllocateBuffers(); 186 AllocateBuffers();
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 protocol::VideoStub* PepperVideoRenderer2D::GetVideoStub() {
196 scoped_ptr<VideoPacket> video_packet,
197 const base::Closure& done) {
198 DCHECK(CalledOnValidThread()); 196 DCHECK(CalledOnValidThread());
199 197
200 software_video_renderer_->ProcessVideoPacket(video_packet.Pass(), done); 198 return software_video_renderer_->GetVideoStub();
201 } 199 }
202 200
203 void PepperVideoRenderer2D::ApplyBuffer(const webrtc::DesktopSize& view_size, 201 void PepperVideoRenderer2D::ApplyBuffer(const webrtc::DesktopSize& view_size,
204 const webrtc::DesktopRect& clip_area, 202 const webrtc::DesktopRect& clip_area,
205 webrtc::DesktopFrame* buffer, 203 webrtc::DesktopFrame* buffer,
206 const webrtc::DesktopRegion& region, 204 const webrtc::DesktopRegion& region,
207 const webrtc::DesktopRegion& shape) { 205 const webrtc::DesktopRegion& shape) {
208 DCHECK(CalledOnValidThread()); 206 DCHECK(CalledOnValidThread());
209 207
210 if (!frame_received_) { 208 if (!frame_received_) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 354
357 // If there is a buffer queued for rendering then render it now. 355 // If there is a buffer queued for rendering then render it now.
358 if (merge_buffer_) { 356 if (merge_buffer_) {
359 buffer = merge_buffer_; 357 buffer = merge_buffer_;
360 merge_buffer_ = nullptr; 358 merge_buffer_ = nullptr;
361 FlushBuffer(merge_clip_area_, buffer, merge_region_); 359 FlushBuffer(merge_clip_area_, buffer, merge_region_);
362 } 360 }
363 } 361 }
364 362
365 } // namespace remoting 363 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_video_renderer_2d.h ('k') | remoting/client/plugin/pepper_video_renderer_3d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698