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

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

Issue 8304017: enable video capture to support sharing across multiple renderer processes (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/stl_util.h"
9 #include "content/browser/browser_thread.h" 9 #include "content/browser/browser_thread.h"
10 #include "content/browser/renderer_host/media/video_capture_controller.h"
11 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
10 #include "media/video/capture/fake_video_capture_device.h" 12 #include "media/video/capture/fake_video_capture_device.h"
11 #include "media/video/capture/video_capture_device.h" 13 #include "media/video/capture/video_capture_device.h"
12 14
13 namespace media_stream { 15 namespace media_stream {
14 16
15 // Starting id for the first capture session. 17 // Starting id for the first capture session.
16 // VideoCaptureManager::kStartOpenSessionId is used as default id without 18 // VideoCaptureManager::kStartOpenSessionId is used as default id without
17 // explicitly calling open device. 19 // explicitly calling open device.
18 enum { kFirstSessionId = VideoCaptureManager::kStartOpenSessionId + 1 }; 20 enum { kFirstSessionId = VideoCaptureManager::kStartOpenSessionId + 1 };
19 21
22 struct VideoCaptureManager::Controller {
23 Controller(
24 VideoCaptureController* vc_controller,
25 VideoCaptureControllerEventHandler* handler)
26 : controller(vc_controller),
27 ready_to_delete(false) {
28 handlers.push_front(handler);
29 }
30 ~Controller() {}
31
32 scoped_refptr<VideoCaptureController> controller;
33 bool ready_to_delete;
34 Handlers handlers;
35 };
36
20 VideoCaptureManager::VideoCaptureManager() 37 VideoCaptureManager::VideoCaptureManager()
21 : vc_device_thread_("VideoCaptureManagerThread"), 38 : vc_device_thread_("VideoCaptureManagerThread"),
22 listener_(NULL), 39 listener_(NULL),
23 new_capture_session_id_(kFirstSessionId), 40 new_capture_session_id_(kFirstSessionId),
24 use_fake_device_(false) { 41 use_fake_device_(false) {
25 vc_device_thread_.Start(); 42 vc_device_thread_.Start();
26 } 43 }
27 44
28 VideoCaptureManager::~VideoCaptureManager() { 45 VideoCaptureManager::~VideoCaptureManager() {
29 vc_device_thread_.Stop(); 46 vc_device_thread_.Stop();
30 // TODO(mflodman) Remove this temporary solution when shut-down issue is 47 // TODO(mflodman) Remove this temporary solution when shut-down issue is
31 // resolved, i.e. all code below this comment. 48 // resolved, i.e. all code below this comment.
32 // Temporary solution: close all open devices and delete them, after the 49 // Temporary solution: close all open devices and delete them, after the
33 // thread is stopped. 50 // thread is stopped.
34 DLOG_IF(ERROR, !devices_.empty()) << "VideoCaptureManager: Open devices!"; 51 DLOG_IF(ERROR, !devices_.empty()) << "VideoCaptureManager: Open devices!";
35 for (VideoCaptureDevices::iterator it = devices_.begin(); 52 for (VideoCaptureDevices::iterator it = devices_.begin();
36 it != devices_.end(); 53 it != devices_.end();
37 ++it) { 54 ++it) {
38 it->second->DeAllocate(); 55 it->second->DeAllocate();
39 delete it->second; 56 delete it->second;
40 } 57 }
58 STLDeleteValues(&controllers_);
41 } 59 }
42 60
43 void VideoCaptureManager::Register(MediaStreamProviderListener* listener) { 61 void VideoCaptureManager::Register(MediaStreamProviderListener* listener) {
44 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 62 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
45 DCHECK(!listener_); 63 DCHECK(!listener_);
46 listener_ = listener; 64 listener_ = listener;
47 } 65 }
48 66
49 void VideoCaptureManager::Unregister() { 67 void VideoCaptureManager::Unregister() {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 204
187 PostOnClosed(capture_session_id); 205 PostOnClosed(capture_session_id);
188 } 206 }
189 207
190 void VideoCaptureManager::OnStart( 208 void VideoCaptureManager::OnStart(
191 const media::VideoCaptureParams capture_params, 209 const media::VideoCaptureParams capture_params,
192 media::VideoCaptureDevice::EventHandler* video_capture_receiver) { 210 media::VideoCaptureDevice::EventHandler* video_capture_receiver) {
193 DCHECK(IsOnCaptureDeviceThread()); 211 DCHECK(IsOnCaptureDeviceThread());
194 DCHECK(video_capture_receiver != NULL); 212 DCHECK(video_capture_receiver != NULL);
195 213
196 // Solution for not using MediaStreamManager. 214 media::VideoCaptureDevice* video_capture_device =
197 // This session id won't be returned by Open(). 215 GetDeviceInternal(capture_params.session_id);
198 if (capture_params.session_id == kStartOpenSessionId) { 216 if (!video_capture_device) {
199 // Start() is called without using Open(), we need to open a device.
200 media::VideoCaptureDevice::Names device_names;
201 GetAvailableDevices(&device_names);
202 if (device_names.empty()) {
203 // No devices available.
204 video_capture_receiver->OnError();
205 return;
206 }
207 StreamDeviceInfo device(kVideoCapture,
208 device_names.front().device_name,
209 device_names.front().unique_id, false);
210
211 // Call OnOpen to open using the first device in the list.
212 OnOpen(capture_params.session_id, device);
213 }
214
215 VideoCaptureDevices::iterator it = devices_.find(capture_params.session_id);
216 if (it == devices_.end()) {
217 // Invalid session id. 217 // Invalid session id.
218 video_capture_receiver->OnError(); 218 video_capture_receiver->OnError();
219 return; 219 return;
220 } 220 }
221 media::VideoCaptureDevice* video_capture_device = it->second;
222 221
223 // Possible errors are signaled to video_capture_receiver by 222 // Possible errors are signaled to video_capture_receiver by
224 // video_capture_device. video_capture_receiver to perform actions. 223 // video_capture_device. video_capture_receiver to perform actions.
225 video_capture_device->Allocate(capture_params.width, capture_params.height, 224 video_capture_device->Allocate(capture_params.width, capture_params.height,
226 capture_params.frame_per_second, 225 capture_params.frame_per_second,
227 video_capture_receiver); 226 video_capture_receiver);
228 video_capture_device->Start(); 227 video_capture_device->Start();
229 } 228 }
230 229
231 void VideoCaptureManager::OnStop( 230 void VideoCaptureManager::OnStop(
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 for (VideoCaptureDevices::iterator it = devices_.begin(); 362 for (VideoCaptureDevices::iterator it = devices_.begin();
364 it != devices_.end(); 363 it != devices_.end();
365 it++) { 364 it++) {
366 if (device_info.device_id == it->second->device_name().unique_id) { 365 if (device_info.device_id == it->second->device_name().unique_id) {
367 return true; 366 return true;
368 } 367 }
369 } 368 }
370 return false; 369 return false;
371 } 370 }
372 371
372 void VideoCaptureManager::AddController(
373 const media::VideoCaptureParams& capture_params,
374 VideoCaptureControllerEventHandler* handler,
375 base::Callback<void(VideoCaptureController*)> added_cb) {
376 DCHECK(handler);
377 vc_device_thread_.message_loop()->PostTask(
378 FROM_HERE,
379 base::Bind(&VideoCaptureManager::DoAddControllerOnDeviceThread,
380 base::Unretained(this), capture_params, handler, added_cb));
381 }
382
383 void VideoCaptureManager::DoAddControllerOnDeviceThread(
384 const media::VideoCaptureParams capture_params,
385 VideoCaptureControllerEventHandler* handler,
386 base::Callback<void(VideoCaptureController*)> added_cb) {
387 DCHECK(IsOnCaptureDeviceThread());
388
389 media::VideoCaptureDevice* video_capture_device =
390 GetDeviceInternal(capture_params.session_id);
391 scoped_refptr<VideoCaptureController> ctrller = NULL;
392 if (video_capture_device) {
393 Controllers::iterator cit = controllers_.find(video_capture_device);
394 if (cit == controllers_.end()) {
395 ctrller = new VideoCaptureController(this);
396 controllers_[video_capture_device] = new Controller(ctrller, handler);
397 } else {
398 controllers_[video_capture_device]->handlers.push_front(handler);
399 ctrller = controllers_[video_capture_device]->controller;
400 }
401 }
402 added_cb.Run(ctrller);
403 }
404
405 void VideoCaptureManager::RemoveController(
406 VideoCaptureController* controller,
407 VideoCaptureControllerEventHandler* handler) {
408 DCHECK(handler);
409 vc_device_thread_.message_loop()->PostTask(
410 FROM_HERE,
411 base::Bind(&VideoCaptureManager::DoRemoveControllerOnDeviceThread,
412 base::Unretained(this),
413 make_scoped_refptr(controller),
414 handler));
415 }
416
417 void VideoCaptureManager::DoRemoveControllerOnDeviceThread(
418 VideoCaptureController* controller,
419 VideoCaptureControllerEventHandler* handler) {
420 DCHECK(IsOnCaptureDeviceThread());
421
422 for (Controllers::iterator cit = controllers_.begin();
423 cit != controllers_.end(); ++cit) {
424 if (controller == cit->second->controller) {
425 Handlers& handlers = cit->second->handlers;
426 for (Handlers::iterator hit = handlers.begin();
427 hit != handlers.end(); ++hit) {
428 if ((*hit) == handler) {
429 handlers.erase(hit);
430 break;
431 }
432 }
433 if (handlers.size() == 0 && cit->second->ready_to_delete) {
434 delete cit->second;
435 controllers_.erase(cit);
436 }
437 return;
438 }
439 }
440 }
441
442 void VideoCaptureManager::DeviceStatusFromController(
443 VideoCaptureController* controller, bool in_use) {
444 DCHECK(controller);
445 vc_device_thread_.message_loop()->PostTask(
446 FROM_HERE, base::Bind(
447 &VideoCaptureManager::DoDeviceStatusFromControllerOnDeviceThread,
448 base::Unretained(this),
449 make_scoped_refptr(controller),
450 in_use));
451 }
452
453 void VideoCaptureManager::DoDeviceStatusFromControllerOnDeviceThread(
454 VideoCaptureController* controller, bool in_use) {
455 DCHECK(IsOnCaptureDeviceThread());
456 for (Controllers::iterator cit = controllers_.begin();
457 cit != controllers_.end(); ++cit) {
458 if (controller == cit->second->controller) {
459 if (in_use) {
460 cit->second->ready_to_delete = false;
461 } else {
462 cit->second->ready_to_delete = true;
463 if (cit->second->handlers.size() == 0) {
464 delete cit->second;
465 controllers_.erase(cit);
466 }
467 }
468 return;
469 }
470 }
471 }
472
473 media::VideoCaptureDevice* VideoCaptureManager::GetDeviceInternal(
474 int capture_session_id) {
475 DCHECK(IsOnCaptureDeviceThread());
476 VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
477 if (dit != devices_.end()) {
478 return dit->second;
479 }
480
481 // Solution for not using MediaStreamManager.
482 // This session id won't be returned by Open().
483 if (capture_session_id == kStartOpenSessionId) {
484 media::VideoCaptureDevice::Names device_names;
485 GetAvailableDevices(&device_names);
486 if (device_names.empty()) {
487 // No devices available.
488 return NULL;
489 }
490 StreamDeviceInfo device(kVideoCapture,
491 device_names.front().device_name,
492 device_names.front().unique_id, false);
493
494 // Call OnOpen to open using the first device in the list.
495 OnOpen(capture_session_id, device);
496
497 VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
498 if (dit != devices_.end()) {
499 return dit->second;
500 }
501 }
502 return NULL;
503 }
504
373 } // namespace media_stream 505 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698