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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range. (Closed)
Patch Set: 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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 m_component->getSettings(platformSettings); 161 m_component->getSettings(platformSettings);
162 if (platformSettings.hasFrameRate()) { 162 if (platformSettings.hasFrameRate()) {
163 settings.setFrameRate(platformSettings.frameRate); 163 settings.setFrameRate(platformSettings.frameRate);
164 } 164 }
165 if (platformSettings.hasWidth()) { 165 if (platformSettings.hasWidth()) {
166 settings.setWidth(platformSettings.width); 166 settings.setWidth(platformSettings.width);
167 } 167 }
168 if (platformSettings.hasHeight()) { 168 if (platformSettings.hasHeight()) {
169 settings.setHeight(platformSettings.height); 169 settings.setHeight(platformSettings.height);
170 } 170 }
171 if (RuntimeEnabledFeatures::mediaCaptureDepthEnabled()) {
172 settings.setDepthNear(platformSettings.depthNear);
173 settings.setDepthFar(platformSettings.depthFar);
174 settings.setFocalLengthX(platformSettings.focalLengthX);
175 settings.setFocalLengthY(platformSettings.focalLengthY);
176 }
171 settings.setDeviceId(platformSettings.deviceId); 177 settings.setDeviceId(platformSettings.deviceId);
172 } 178 }
173 179
174 bool MediaStreamTrack::ended() const { 180 bool MediaStreamTrack::ended() const {
175 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); 181 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
176 } 182 }
177 183
178 void MediaStreamTrack::sourceChangedState() { 184 void MediaStreamTrack::sourceChangedState() {
179 if (ended()) 185 if (ended())
180 return; 186 return;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 260 }
255 261
256 DEFINE_TRACE(MediaStreamTrack) { 262 DEFINE_TRACE(MediaStreamTrack) {
257 visitor->trace(m_registeredMediaStreams); 263 visitor->trace(m_registeredMediaStreams);
258 visitor->trace(m_component); 264 visitor->trace(m_component);
259 EventTargetWithInlineData::trace(visitor); 265 EventTargetWithInlineData::trace(visitor);
260 ActiveDOMObject::trace(visitor); 266 ActiveDOMObject::trace(visitor);
261 } 267 }
262 268
263 } // namespace blink 269 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698