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() && | |
232 m_component->source()->type() == MediaStreamSource::TypeVideo) { | |
233 if (platformSettings.hasVideoKind()) | |
Guido Urdaneta
2017/02/07 10:26:04
This if could be another && in the previous if
aleksandar.stojiljkovic
2017/02/07 11:33:49
Left it deliberately, as more fields (depthNear/Fa
| |
234 settings.setVideoKind(platformSettings.videoKind); | |
235 } | |
231 settings.setDeviceId(platformSettings.deviceId); | 236 settings.setDeviceId(platformSettings.deviceId); |
232 if (platformSettings.hasFacingMode()) { | 237 if (platformSettings.hasFacingMode()) { |
233 switch (platformSettings.facingMode) { | 238 switch (platformSettings.facingMode) { |
234 case WebMediaStreamTrack::FacingMode::User: | 239 case WebMediaStreamTrack::FacingMode::User: |
235 settings.setFacingMode("user"); | 240 settings.setFacingMode("user"); |
236 break; | 241 break; |
237 case WebMediaStreamTrack::FacingMode::Environment: | 242 case WebMediaStreamTrack::FacingMode::Environment: |
238 settings.setFacingMode("environment"); | 243 settings.setFacingMode("environment"); |
239 break; | 244 break; |
240 case WebMediaStreamTrack::FacingMode::Left: | 245 case WebMediaStreamTrack::FacingMode::Left: |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
333 } | 338 } |
334 | 339 |
335 DEFINE_TRACE(MediaStreamTrack) { | 340 DEFINE_TRACE(MediaStreamTrack) { |
336 visitor->trace(m_registeredMediaStreams); | 341 visitor->trace(m_registeredMediaStreams); |
337 visitor->trace(m_component); | 342 visitor->trace(m_component); |
338 EventTargetWithInlineData::trace(visitor); | 343 EventTargetWithInlineData::trace(visitor); |
339 ContextLifecycleObserver::trace(visitor); | 344 ContextLifecycleObserver::trace(visitor); |
340 } | 345 } |
341 | 346 |
342 } // namespace blink | 347 } // namespace blink |
OLD | NEW |