| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/browser/renderer_host/media/desktop_capture_device_ash.h" | 5 #include "content/browser/renderer_host/media/desktop_capture_device_aura.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/timer/timer.h" | 8 #include "base/timer/timer.h" |
| 9 #include "cc/output/copy_output_request.h" | 9 #include "cc/output/copy_output_request.h" |
| 10 #include "cc/output/copy_output_result.h" | 10 #include "cc/output/copy_output_result.h" |
| 11 #include "content/browser/aura/image_transport_factory.h" | 11 #include "content/browser/aura/image_transport_factory.h" |
| 12 #include "content/browser/renderer_host/media/video_capture_device_impl.h" | 12 #include "content/browser/renderer_host/media/video_capture_device_impl.h" |
| 13 #include "content/common/gpu/client/gl_helper.h" | 13 #include "content/common/gpu/client/gl_helper.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "media/base/video_util.h" | 15 #include "media/base/video_util.h" |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 } | 287 } |
| 288 | 288 |
| 289 void DesktopVideoCaptureMachine::OnCompositingEnded( | 289 void DesktopVideoCaptureMachine::OnCompositingEnded( |
| 290 ui::Compositor* compositor) { | 290 ui::Compositor* compositor) { |
| 291 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( | 291 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( |
| 292 &DesktopVideoCaptureMachine::Capture, AsWeakPtr(), true)); | 292 &DesktopVideoCaptureMachine::Capture, AsWeakPtr(), true)); |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace | 295 } // namespace |
| 296 | 296 |
| 297 DesktopCaptureDeviceAsh::DesktopCaptureDeviceAsh( | 297 DesktopCaptureDeviceAura::DesktopCaptureDeviceAura( |
| 298 const DesktopMediaID& source) | 298 const DesktopMediaID& source) |
| 299 : impl_(new VideoCaptureDeviceImpl(scoped_ptr<VideoCaptureMachine>( | 299 : impl_(new VideoCaptureDeviceImpl(scoped_ptr<VideoCaptureMachine>( |
| 300 new DesktopVideoCaptureMachine(source)))) {} | 300 new DesktopVideoCaptureMachine(source)))) {} |
| 301 | 301 |
| 302 DesktopCaptureDeviceAsh::~DesktopCaptureDeviceAsh() { | 302 DesktopCaptureDeviceAura::~DesktopCaptureDeviceAura() { |
| 303 DVLOG(2) << "DesktopCaptureDeviceAsh@" << this << " destroying."; | 303 DVLOG(2) << "DesktopCaptureDeviceAura@" << this << " destroying."; |
| 304 } | 304 } |
| 305 | 305 |
| 306 // static | 306 // static |
| 307 media::VideoCaptureDevice* DesktopCaptureDeviceAsh::Create( | 307 media::VideoCaptureDevice* DesktopCaptureDeviceAura::Create( |
| 308 const DesktopMediaID& source) { | 308 const DesktopMediaID& source) { |
| 309 // This implementation only supports screen capture. | 309 // This implementation only supports screen capture. |
| 310 if (source.type != DesktopMediaID::TYPE_SCREEN) | 310 if (source.type != DesktopMediaID::TYPE_SCREEN) |
| 311 return NULL; | 311 return NULL; |
| 312 | 312 |
| 313 return new DesktopCaptureDeviceAsh(source); | 313 return new DesktopCaptureDeviceAura(source); |
| 314 } | 314 } |
| 315 | 315 |
| 316 void DesktopCaptureDeviceAsh::AllocateAndStart( | 316 void DesktopCaptureDeviceAura::AllocateAndStart( |
| 317 const media::VideoCaptureParams& params, | 317 const media::VideoCaptureParams& params, |
| 318 scoped_ptr<Client> client) { | 318 scoped_ptr<Client> client) { |
| 319 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); | 319 DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString(); |
| 320 impl_->AllocateAndStart(params, client.Pass()); | 320 impl_->AllocateAndStart(params, client.Pass()); |
| 321 } | 321 } |
| 322 | 322 |
| 323 void DesktopCaptureDeviceAsh::StopAndDeAllocate() { | 323 void DesktopCaptureDeviceAura::StopAndDeAllocate() { |
| 324 impl_->StopAndDeAllocate(); | 324 impl_->StopAndDeAllocate(); |
| 325 } | 325 } |
| 326 | 326 |
| 327 } // namespace content | 327 } // namespace content |
| OLD | NEW |