Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: content/renderer/media/media_stream_video_track.cc

Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range. (Closed)
Patch Set: Added to MediaTrackSupportedConstraints and MediaTrackConstraintSet. Thanks mcasas@. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/media/media_stream_video_track.h" 5 #include "content/renderer/media/media_stream_video_track.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 294 DCHECK(main_render_thread_checker_.CalledOnValidThread());
295 if (source_) { 295 if (source_) {
296 source_->RemoveTrack(this); 296 source_->RemoveTrack(this);
297 source_ = NULL; 297 source_ = NULL;
298 } 298 }
299 OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded); 299 OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
300 } 300 }
301 301
302 void MediaStreamVideoTrack::getSettings( 302 void MediaStreamVideoTrack::getSettings(
303 blink::WebMediaStreamTrack::Settings& settings) { 303 blink::WebMediaStreamTrack::Settings& settings) {
304 if (source_) {
305 const media::VideoCaptureFormat* format = source_->GetCurrentFormat();
306 if (format) {
307 settings.frameRate = format->frame_rate;
308 settings.width = format->frame_size.width();
309 settings.height = format->frame_size.height();
310 }
311 }
312 // TODO(hta): Extract the real value. 304 // TODO(hta): Extract the real value.
313 settings.deviceId = blink::WebString("video device ID"); 305 settings.deviceId = blink::WebString("video device ID");
306 if (!source_)
307 return;
308
309 const media::VideoCaptureFormat* format = source_->GetCurrentFormat();
310 if (format) {
311 settings.frameRate = format->frame_rate;
312 settings.width = format->frame_size.width();
313 settings.height = format->frame_size.height();
314 }
315 const base::Optional<CameraCalibration> calibration =
316 source_->device_info().device.camera_calibration;
317 if (calibration) {
318 settings.depthNear = calibration->depth_near;
319 settings.depthFar = calibration->depth_far;
320 settings.focalLengthX = calibration->focal_length_x;
321 settings.focalLengthY = calibration->focal_length_y;
322 }
314 } 323 }
315 324
316 void MediaStreamVideoTrack::OnReadyStateChanged( 325 void MediaStreamVideoTrack::OnReadyStateChanged(
317 blink::WebMediaStreamSource::ReadyState state) { 326 blink::WebMediaStreamSource::ReadyState state) {
318 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 327 DCHECK(main_render_thread_checker_.CalledOnValidThread());
319 for (auto* sink : sinks_) 328 for (auto* sink : sinks_)
320 sink->OnReadyStateChanged(state); 329 sink->OnReadyStateChanged(state);
321 } 330 }
322 331
323 } // namespace content 332 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698