| 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 599018f61e8dfd86409a9eb3807ab884c6ccd47c..0f366f5a77148c6e7c022386f72503cfae3a7800 100644
|
| --- a/content/renderer/media/media_stream_video_track.cc
|
| +++ b/content/renderer/media/media_stream_video_track.cc
|
| @@ -302,18 +302,15 @@ void MediaStreamVideoTrack::Stop() {
|
|
|
| void MediaStreamVideoTrack::getSettings(
|
| blink::WebMediaStreamTrack::Settings& settings) {
|
| - // 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 = GetVideoKindForFormat(*format);
|
| }
|
| + if (width_ && height_) {
|
| + settings.width = width_;
|
| + settings.height = height_;
|
| + }
|
| switch (source_->device_info().device.video_facing) {
|
| case media::MEDIA_VIDEO_FACING_NONE:
|
| settings.facingMode = blink::WebMediaStreamTrack::FacingMode::None;
|
|
|