| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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() && | 231 if (RuntimeEnabledFeatures::mediaCaptureDepthEnabled() && |
| 232 m_component->source()->type() == MediaStreamSource::TypeVideo) { | 232 m_component->source()->type() == MediaStreamSource::TypeVideo) { |
| 233 if (platformSettings.hasVideoKind()) |
| 234 settings.setVideoKind(platformSettings.videoKind); |
| 233 if (platformSettings.hasDepthNear()) | 235 if (platformSettings.hasDepthNear()) |
| 234 settings.setDepthNear(platformSettings.depthNear); | 236 settings.setDepthNear(platformSettings.depthNear); |
| 235 if (platformSettings.hasDepthFar()) | 237 if (platformSettings.hasDepthFar()) |
| 236 settings.setDepthFar(platformSettings.depthFar); | 238 settings.setDepthFar(platformSettings.depthFar); |
| 237 if (platformSettings.hasFocalLengthX()) | 239 if (platformSettings.hasFocalLengthX()) |
| 238 settings.setFocalLengthX(platformSettings.focalLengthX); | 240 settings.setFocalLengthX(platformSettings.focalLengthX); |
| 239 if (platformSettings.hasFocalLengthY()) | 241 if (platformSettings.hasFocalLengthY()) |
| 240 settings.setFocalLengthY(platformSettings.focalLengthY); | 242 settings.setFocalLengthY(platformSettings.focalLengthY); |
| 241 } | 243 } |
| 242 settings.setDeviceId(platformSettings.deviceId); | 244 settings.setDeviceId(platformSettings.deviceId); |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 } | 346 } |
| 345 | 347 |
| 346 DEFINE_TRACE(MediaStreamTrack) { | 348 DEFINE_TRACE(MediaStreamTrack) { |
| 347 visitor->trace(m_registeredMediaStreams); | 349 visitor->trace(m_registeredMediaStreams); |
| 348 visitor->trace(m_component); | 350 visitor->trace(m_component); |
| 349 EventTargetWithInlineData::trace(visitor); | 351 EventTargetWithInlineData::trace(visitor); |
| 350 ContextLifecycleObserver::trace(visitor); | 352 ContextLifecycleObserver::trace(visitor); |
| 351 } | 353 } |
| 352 | 354 |
| 353 } // namespace blink | 355 } // namespace blink |
| OLD | NEW |