Chromium Code Reviews| 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 "content/browser/renderer_host/media/media_stream_manager.h" | 5 #include "content/browser/renderer_host/media/media_stream_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 443 DCHECK(audio_input_device_manager_.get()); | 443 DCHECK(audio_input_device_manager_.get()); |
| 444 return audio_input_device_manager_.get(); | 444 return audio_input_device_manager_.get(); |
| 445 } | 445 } |
| 446 | 446 |
| 447 MediaDevicesManager* MediaStreamManager::media_devices_manager() { | 447 MediaDevicesManager* MediaStreamManager::media_devices_manager() { |
| 448 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 448 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 449 // nullptr might be returned during shutdown. | 449 // nullptr might be returned during shutdown. |
| 450 return media_devices_manager_.get(); | 450 return media_devices_manager_.get(); |
| 451 } | 451 } |
| 452 | 452 |
| 453 void MediaStreamManager::AddVideoCaptureObserver( | |
| 454 media::VideoCaptureObserver* capture_observer) { | |
| 455 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
| 456 if (video_capture_manager_.get() != nullptr) { | |
|
nasko
2017/02/15 19:13:47
Drop the ".get()" and ideally also the nullptr com
shenghao
2017/02/15 22:46:49
Done.
| |
| 457 video_capture_manager_->AddVideoCaptureObserver(capture_observer); | |
| 458 } | |
| 459 } | |
| 460 | |
| 461 void MediaStreamManager::RemoveAllVideoCaptureObservers() { | |
| 462 DCHECK_CURRENTLY_ON(BrowserThread::IO); | |
| 463 if (video_capture_manager_.get() != nullptr) { | |
|
nasko
2017/02/15 19:13:47
Same here.
shenghao
2017/02/15 22:46:49
Done.
| |
| 464 video_capture_manager_->RemoveAllVideoCaptureObservers(); | |
| 465 } | |
| 466 } | |
| 467 | |
| 453 std::string MediaStreamManager::MakeMediaAccessRequest( | 468 std::string MediaStreamManager::MakeMediaAccessRequest( |
| 454 int render_process_id, | 469 int render_process_id, |
| 455 int render_frame_id, | 470 int render_frame_id, |
| 456 int page_request_id, | 471 int page_request_id, |
| 457 const StreamControls& controls, | 472 const StreamControls& controls, |
| 458 const url::Origin& security_origin, | 473 const url::Origin& security_origin, |
| 459 const MediaRequestResponseCallback& callback) { | 474 const MediaRequestResponseCallback& callback) { |
| 460 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 475 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 461 | 476 |
| 462 // TODO(perkj): The argument list with NULL parameters to DeviceRequest | 477 // TODO(perkj): The argument list with NULL parameters to DeviceRequest |
| (...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1753 return devices; | 1768 return devices; |
| 1754 | 1769 |
| 1755 for (auto& device : devices) { | 1770 for (auto& device : devices) { |
| 1756 device.camera_calibration = | 1771 device.camera_calibration = |
| 1757 video_capture_manager()->GetCameraCalibration(device.id); | 1772 video_capture_manager()->GetCameraCalibration(device.id); |
| 1758 } | 1773 } |
| 1759 return devices; | 1774 return devices; |
| 1760 } | 1775 } |
| 1761 | 1776 |
| 1762 } // namespace content | 1777 } // namespace content |
| OLD | NEW |