Chromium Code Reviews| Index: content/browser/renderer_host/media/video_capture_manager.cc |
| diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc |
| index 44094c78cc1384b3cf6150a8f250d5bb57eb9d91..d288638f87598437b018e72feca409e8d335eecd 100644 |
| --- a/content/browser/renderer_host/media/video_capture_manager.cc |
| +++ b/content/browser/renderer_host/media/video_capture_manager.cc |
| @@ -34,6 +34,7 @@ |
| #include "content/public/common/media_stream_request.h" |
| #include "media/base/bind_to_current_loop.h" |
| #include "media/base/media_switches.h" |
| +#include "media/base/video_facing.h" |
| #include "media/capture/video/video_capture_buffer_pool_impl.h" |
| #include "media/capture/video/video_capture_buffer_tracker_factory_impl.h" |
| #include "media/capture/video/video_capture_device.h" |
| @@ -339,6 +340,16 @@ VideoCaptureManager::~VideoCaptureManager() { |
| DCHECK(device_start_queue_.empty()); |
| } |
| +void VideoCaptureManager::AddVideoCaptureObserver( |
|
tommi (sloooow) - chröme
2017/02/15 18:56:04
please add DCHECK_CURRENTLY_ON(BrowserThread::IO);
shenghao
2017/02/15 22:46:49
Done.
|
| + media::VideoCaptureObserver* observer) { |
| + DCHECK(observer); |
| + capture_observers_.AddObserver(observer); |
| +} |
| + |
| +void VideoCaptureManager::RemoveAllVideoCaptureObservers() { |
| + capture_observers_.Clear(); |
| +} |
| + |
| void VideoCaptureManager::RegisterListener( |
| MediaStreamProviderListener* listener) { |
| DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| @@ -468,6 +479,12 @@ void VideoCaptureManager::DoStopDevice(DeviceEntry* entry) { |
| } |
| } |
| + const DeviceInfo* device_info = GetDeviceInfoById(entry->id); |
| + if (device_info != nullptr) { |
| + for (auto& observer : capture_observers_) |
| + observer.OnVideoCaptureStopped(device_info->descriptor.facing); |
| + } |
| + |
| DVLOG(3) << "DoStopDevice. Send stop request for device = " << entry->id |
| << " serial_id = " << entry->serial_id << "."; |
| entry->video_capture_controller.OnLog( |
| @@ -524,6 +541,9 @@ void VideoCaptureManager::HandleQueuedStartRequest() { |
| found->descriptor.GetNameAndModel().c_str(), |
| found->descriptor.GetCaptureApiTypeString())); |
| + for (auto& observer : capture_observers_) |
| + observer.OnVideoCaptureStarted(found->descriptor.facing); |
| + |
| start_capture_function = |
| base::Bind(&VideoCaptureManager::DoStartDeviceCaptureOnDeviceThread, |
| this, found->descriptor, request->params(), |