| Index: content/browser/renderer_host/media/service_launched_video_capture_device.cc
|
| diff --git a/content/browser/renderer_host/media/service_launched_video_capture_device.cc b/content/browser/renderer_host/media/service_launched_video_capture_device.cc
|
| index a50fa9cc2a2e8d9ca33b70dc58d495beef465af8..706ba285f76523181c0f9806b7dd5bf15c5cc858 100644
|
| --- a/content/browser/renderer_host/media/service_launched_video_capture_device.cc
|
| +++ b/content/browser/renderer_host/media/service_launched_video_capture_device.cc
|
| @@ -8,47 +8,69 @@ namespace content {
|
|
|
| ServiceLaunchedVideoCaptureDevice::ServiceLaunchedVideoCaptureDevice(
|
| video_capture::mojom::DevicePtr device)
|
| - : device_(std::move(device)) {}
|
| + : device_(std::move(device)) {
|
| + // Unretained |this| is safe, because |this| owns |device_|.
|
| + device_.set_connection_error_handler(
|
| + base::Bind(&ServiceLaunchedVideoCaptureDevice::OnLostConnectionToDevice,
|
| + base::Unretained(this)));
|
| +}
|
|
|
| -ServiceLaunchedVideoCaptureDevice::~ServiceLaunchedVideoCaptureDevice() {}
|
| +ServiceLaunchedVideoCaptureDevice::~ServiceLaunchedVideoCaptureDevice() {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| +}
|
|
|
| void ServiceLaunchedVideoCaptureDevice::GetPhotoCapabilities(
|
| media::VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) const {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::SetPhotoOptions(
|
| media::mojom::PhotoSettingsPtr settings,
|
| media::VideoCaptureDevice::SetPhotoOptionsCallback callback) {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::TakePhoto(
|
| media::VideoCaptureDevice::TakePhotoCallback callback) {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::MaybeSuspendDevice() {
|
| - NOTIMPLEMENTED();
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + // Not yet implemented on service side. Do nothing here.
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::ResumeDevice() {
|
| - NOTIMPLEMENTED();
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + // Not yet implemented on service side. Do nothing here.
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::RequestRefreshFrame() {
|
| - NOTIMPLEMENTED();
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + // Not yet implemented on service side. Do nothing here.
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::SetDesktopCaptureWindowIdAsync(
|
| gfx::NativeViewId window_id,
|
| base::OnceClosure done_cb) {
|
| - NOTIMPLEMENTED();
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + // This method should only be called for desktop capture devices.
|
| + // The video_capture Mojo service does not support desktop capture devices
|
| + // (yet) and should not be used for it.
|
| + NOTREACHED();
|
| }
|
|
|
| void ServiceLaunchedVideoCaptureDevice::OnUtilizationReport(
|
| int frame_feedback_id,
|
| double utilization) {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + device_->OnReceiverReportingUtilization(frame_feedback_id, utilization);
|
| +}
|
| +
|
| +void ServiceLaunchedVideoCaptureDevice::OnLostConnectionToDevice() {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
|
|