Media Capture Depth Stream Extensions API: focal length and depth range.

content/renderer/media/media_stream_video_track.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_video_track.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 276 matching lines @@
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   if (source_) {
     source_->RemoveTrack(this);
     source_ = NULL;
   }
   OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamVideoTrack::getSettings(
     blink::WebMediaStreamTrack::Settings& settings) {
-  if (source_) {
-    const media::VideoCaptureFormat* format = source_->GetCurrentFormat();
-    if (format) {
-      settings.frameRate = format->frame_rate;
-      settings.width = format->frame_size.width();
-      settings.height = format->frame_size.height();
-    }
-  }
   // TODO(hta): Extract the real value.
   settings.deviceId = blink::WebString("video device ID");
+  if (!source_)
+    return;

[kinuko, 2017/01/10 14:43:24]

why don't we have this before line 298?

[aleksandar.stojiljkovic, 2017/01/11 08:58:46]

Good point.
That change would be a functionality change orthogonal to this patch - usually I
try to avoid doing those in the same patch. Let me address it in follow up
patch; could also add a fix for the non-const reference function parameter in
L.296:
https://google.github.io/styleguide/cppguide.html#Reference_Arguments

[aleksandar.stojiljkovic, 2017/01/11 09:32:18]

Please ignore a note about non-const reference. As defined by Blink, it is fine.

+
+  const media::VideoCaptureFormat* format = source_->GetCurrentFormat();
+  if (format) {
+    settings.frameRate = format->frame_rate;
+    settings.width = format->frame_size.width();
+    settings.height = format->frame_size.height();
+  }
+  const base::Optional<CameraCalibration> calibration =
+      source_->device_info().device.camera_calibration;
+  if (calibration) {
+    settings.depthNear = calibration->depth_near;
+    settings.depthFar = calibration->depth_far;
+    settings.focalLengthX = calibration->focal_length_x;
+    settings.focalLengthY = calibration->focal_length_y;
+  }
 }
 
 void MediaStreamVideoTrack::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   for (auto* sink : sinks_)
     sink->OnReadyStateChanged(state);
 }
 
 }  // namespace content