Index: content/renderer/media/media_stream_video_track.cc |
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc |
index 966bfe48bc3edcce67a9f0db0bff615c99bab9c6..b091ad9298a4fb3aa35db19cca2f121bd2477056 100644 |
--- a/content/renderer/media/media_stream_video_track.cc |
+++ b/content/renderer/media/media_stream_video_track.cc |
@@ -301,31 +301,33 @@ void MediaStreamVideoTrack::Stop() { |
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(); |
- } |
- switch (source_->device_info().device.video_facing) { |
- case media::MEDIA_VIDEO_FACING_NONE: |
- settings.facingMode = blink::WebMediaStreamTrack::FacingMode::None; |
- break; |
- case media::MEDIA_VIDEO_FACING_USER: |
- settings.facingMode = blink::WebMediaStreamTrack::FacingMode::User; |
- break; |
- case media::MEDIA_VIDEO_FACING_ENVIRONMENT: |
- settings.facingMode = |
- blink::WebMediaStreamTrack::FacingMode::Environment; |
- break; |
- default: |
- settings.facingMode = blink::WebMediaStreamTrack::FacingMode::None; |
- break; |
- } |
- } |
// TODO(hta): Extract the real value. |
settings.deviceId = blink::WebString("video device ID"); |
+ if (!source_) |
+ return; |
+ |
+ 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(); |
+ settings.videoKind = blink::WebString::fromUTF8( |
+ (format->pixel_format == media::PIXEL_FORMAT_Y16) ? "depth" : "color"); |
+ } |
+ switch (source_->device_info().device.video_facing) { |
+ case media::MEDIA_VIDEO_FACING_NONE: |
+ settings.facingMode = blink::WebMediaStreamTrack::FacingMode::None; |
+ break; |
+ case media::MEDIA_VIDEO_FACING_USER: |
+ settings.facingMode = blink::WebMediaStreamTrack::FacingMode::User; |
+ break; |
+ case media::MEDIA_VIDEO_FACING_ENVIRONMENT: |
+ settings.facingMode = blink::WebMediaStreamTrack::FacingMode::Environment; |
+ break; |
+ default: |
+ settings.facingMode = blink::WebMediaStreamTrack::FacingMode::None; |
+ break; |
+ } |
} |
void MediaStreamVideoTrack::OnReadyStateChanged( |