OLD | NEW |
---|---|
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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
221 m_component->getSettings(platformSettings); | 221 m_component->getSettings(platformSettings); |
222 if (platformSettings.hasFrameRate()) { | 222 if (platformSettings.hasFrameRate()) { |
223 settings.setFrameRate(platformSettings.frameRate); | 223 settings.setFrameRate(platformSettings.frameRate); |
224 } | 224 } |
225 if (platformSettings.hasWidth()) { | 225 if (platformSettings.hasWidth()) { |
226 settings.setWidth(platformSettings.width); | 226 settings.setWidth(platformSettings.width); |
227 } | 227 } |
228 if (platformSettings.hasHeight()) { | 228 if (platformSettings.hasHeight()) { |
229 settings.setHeight(platformSettings.height); | 229 settings.setHeight(platformSettings.height); |
230 } | 230 } |
231 if (RuntimeEnabledFeatures::mediaCaptureDepthEnabled()) { | |
mcasas
2017/01/11 23:18:20
I guess this also only makes sense if:
m_compone
aleksandar.stojiljkovic
2017/01/12 14:13:59
MediaTrackSupportedConstraints / I understand you
aleksandar.stojiljkovic
2017/01/29 18:45:33
Done.
PS#6:
- added near, far and focal length to
| |
232 settings.setDepthNear(platformSettings.depthNear); | |
233 settings.setDepthFar(platformSettings.depthFar); | |
234 settings.setFocalLengthX(platformSettings.focalLengthX); | |
235 settings.setFocalLengthY(platformSettings.focalLengthY); | |
236 } | |
231 settings.setDeviceId(platformSettings.deviceId); | 237 settings.setDeviceId(platformSettings.deviceId); |
232 } | 238 } |
233 | 239 |
234 bool MediaStreamTrack::ended() const { | 240 bool MediaStreamTrack::ended() const { |
235 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); | 241 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); |
236 } | 242 } |
237 | 243 |
238 void MediaStreamTrack::sourceChangedState() { | 244 void MediaStreamTrack::sourceChangedState() { |
239 if (ended()) | 245 if (ended()) |
240 return; | 246 return; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
314 } | 320 } |
315 | 321 |
316 DEFINE_TRACE(MediaStreamTrack) { | 322 DEFINE_TRACE(MediaStreamTrack) { |
317 visitor->trace(m_registeredMediaStreams); | 323 visitor->trace(m_registeredMediaStreams); |
318 visitor->trace(m_component); | 324 visitor->trace(m_component); |
319 EventTargetWithInlineData::trace(visitor); | 325 EventTargetWithInlineData::trace(visitor); |
320 ContextLifecycleObserver::trace(visitor); | 326 ContextLifecycleObserver::trace(visitor); |
321 } | 327 } |
322 | 328 |
323 } // namespace blink | 329 } // namespace blink |
OLD | NEW |