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

Side by Side Diff: content/browser/renderer_host/media/video_capture_manager.cc

Issue 1090273006: Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 "content/browser/renderer_host/media/video_capture_manager.h" 5 #include "content/browser/renderer_host/media/video_capture_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 device_task_runner_.get(), 325 device_task_runner_.get(),
326 FROM_HERE, 326 FROM_HERE,
327 base::Bind( 327 base::Bind(
328 &VideoCaptureManager::DoStartDeviceOnDeviceThread, 328 &VideoCaptureManager::DoStartDeviceOnDeviceThread,
329 this, 329 this,
330 request->session_id(), 330 request->session_id(),
331 entry->id, 331 entry->id,
332 entry->stream_type, 332 entry->stream_type,
333 request->params(), 333 request->params(),
334 base::Passed(entry->video_capture_controller()->NewDeviceClient( 334 base::Passed(entry->video_capture_controller()->NewDeviceClient(
335 device_task_runner_))), 335 device_task_runner_, request->params().requested_format))),
336 base::Bind(&VideoCaptureManager::OnDeviceStarted, this, 336 base::Bind(&VideoCaptureManager::OnDeviceStarted, this,
337 request->serial_id())); 337 request->serial_id()));
338 } 338 }
339 339
340 void VideoCaptureManager::OnDeviceStarted( 340 void VideoCaptureManager::OnDeviceStarted(
341 int serial_id, 341 int serial_id,
342 scoped_ptr<media::VideoCaptureDevice> device) { 342 scoped_ptr<media::VideoCaptureDevice> device) {
343 DCHECK_CURRENTLY_ON(BrowserThread::IO); 343 DCHECK_CURRENTLY_ON(BrowserThread::IO);
344 DCHECK(serial_id == device_start_queue_.begin()->serial_id()); 344 DCHECK(serial_id == device_start_queue_.begin()->serial_id());
345 DVLOG(3) << "OnDeviceStarted"; 345 DVLOG(3) << "OnDeviceStarted";
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 DCHECK(IsOnDeviceThread()); 857 DCHECK(IsOnDeviceThread());
858 #if defined(ENABLE_SCREEN_CAPTURE) 858 #if defined(ENABLE_SCREEN_CAPTURE)
859 DesktopCaptureDevice* desktop_device = 859 DesktopCaptureDevice* desktop_device =
860 static_cast<DesktopCaptureDevice*>(device); 860 static_cast<DesktopCaptureDevice*>(device);
861 desktop_device->SetNotificationWindowId(window_id); 861 desktop_device->SetNotificationWindowId(window_id);
862 VLOG(2) << "Screen capture notification window passed on device thread."; 862 VLOG(2) << "Screen capture notification window passed on device thread.";
863 #endif 863 #endif
864 } 864 }
865 865
866 } // namespace content 866 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698