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

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

Issue 2609863004: Pass camera facing to WebKit (Closed)
Patch Set: address review comment Created 3 years, 11 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_) { 304 if (source_) {
305 const media::VideoCaptureFormat* format = source_->GetCurrentFormat(); 305 const media::VideoCaptureFormat* format = source_->GetCurrentFormat();
306 if (format) { 306 if (format) {
307 settings.frameRate = format->frame_rate; 307 settings.frameRate = format->frame_rate;
308 settings.width = format->frame_size.width(); 308 settings.width = format->frame_size.width();
309 settings.height = format->frame_size.height(); 309 settings.height = format->frame_size.height();
310 const media::VideoFacingMode facing = source_->GetVideoFacing();
311 switch (facing) {
312 case media::VideoFacingMode::USER:
313 settings.facingMode =
314 blink::WebMediaStreamTrack::Settings::VideoFacingMode::User;
315 break;
316 case media::VideoFacingMode::ENVIRONMENT:
317 settings.facingMode = blink::WebMediaStreamTrack::Settings::
318 VideoFacingMode::Environment;
319 break;
320 case media::VideoFacingMode::LEFT:
321 settings.facingMode =
322 blink::WebMediaStreamTrack::Settings::VideoFacingMode::Left;
323 break;
324 case media::VideoFacingMode::RIGHT:
325 settings.facingMode =
326 blink::WebMediaStreamTrack::Settings::VideoFacingMode::Right;
327 break;
328 }
mcasas 2017/01/11 22:24:58 And here, if we get a media::VideoFacingMode::None
shenghao 2017/01/12 08:10:48 Done.
310 } 329 }
311 } 330 }
312 // TODO(hta): Extract the real value. 331 // TODO(hta): Extract the real value.
313 settings.deviceId = blink::WebString("video device ID"); 332 settings.deviceId = blink::WebString("video device ID");
314 } 333 }
315 334
316 void MediaStreamVideoTrack::OnReadyStateChanged( 335 void MediaStreamVideoTrack::OnReadyStateChanged(
317 blink::WebMediaStreamSource::ReadyState state) { 336 blink::WebMediaStreamSource::ReadyState state) {
318 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 337 DCHECK(main_render_thread_checker_.CalledOnValidThread());
319 for (auto* sink : sinks_) 338 for (auto* sink : sinks_)
320 sink->OnReadyStateChanged(state); 339 sink->OnReadyStateChanged(state);
321 } 340 }
322 341
323 } // namespace content 342 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698