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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 DCHECK(audio_input_device_manager_.get()); | 454 DCHECK(audio_input_device_manager_.get()); |
455 return audio_input_device_manager_.get(); | 455 return audio_input_device_manager_.get(); |
456 } | 456 } |
457 | 457 |
458 MediaDevicesManager* MediaStreamManager::media_devices_manager() { | 458 MediaDevicesManager* MediaStreamManager::media_devices_manager() { |
459 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 459 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
460 // nullptr might be returned during shutdown. | 460 // nullptr might be returned during shutdown. |
461 return media_devices_manager_.get(); | 461 return media_devices_manager_.get(); |
462 } | 462 } |
463 | 463 |
| 464 void MediaStreamManager::AddVideoCaptureObserver( |
| 465 media::VideoCaptureObserver* capture_observer) { |
| 466 if (video_capture_manager_.get() != nullptr) { |
| 467 video_capture_manager_->AddVideoCaptureObserver(capture_observer); |
| 468 } |
| 469 } |
| 470 |
| 471 void MediaStreamManager::RemoveAllVideoCaptureObservers() { |
| 472 if (video_capture_manager_.get() != nullptr) { |
| 473 video_capture_manager_->RemoveAllVideoCaptureObservers(); |
| 474 } |
| 475 } |
| 476 |
464 std::string MediaStreamManager::MakeMediaAccessRequest( | 477 std::string MediaStreamManager::MakeMediaAccessRequest( |
465 int render_process_id, | 478 int render_process_id, |
466 int render_frame_id, | 479 int render_frame_id, |
467 int page_request_id, | 480 int page_request_id, |
468 const StreamControls& controls, | 481 const StreamControls& controls, |
469 const url::Origin& security_origin, | 482 const url::Origin& security_origin, |
470 const MediaRequestResponseCallback& callback) { | 483 const MediaRequestResponseCallback& callback) { |
471 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 484 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
472 | 485 |
473 // TODO(perkj): The argument list with NULL parameters to DeviceRequest | 486 // TODO(perkj): The argument list with NULL parameters to DeviceRequest |
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1743 generate_stream_test_callback_ = test_callback; | 1756 generate_stream_test_callback_ = test_callback; |
1744 } | 1757 } |
1745 | 1758 |
1746 #if defined(OS_WIN) | 1759 #if defined(OS_WIN) |
1747 void MediaStreamManager::FlushVideoCaptureThreadForTesting() { | 1760 void MediaStreamManager::FlushVideoCaptureThreadForTesting() { |
1748 video_capture_thread_.FlushForTesting(); | 1761 video_capture_thread_.FlushForTesting(); |
1749 } | 1762 } |
1750 #endif | 1763 #endif |
1751 | 1764 |
1752 } // namespace content | 1765 } // namespace content |
OLD | NEW |