Image Capture: cache constraints and append them to MediaStreamTrack.getConstraints()

third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 198 matching lines @@
 MediaStreamTrack* MediaStreamTrack::clone(ScriptState* scriptState) {
   // TODO(pbos): Make sure m_readyState and m_stopped carries over on cloned
   // tracks.
   MediaStreamComponent* clonedComponent = component()->clone();
   MediaStreamTrack* clonedTrack = MediaStreamTrack::create(
       scriptState->getExecutionContext(), clonedComponent);
   MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
   return clonedTrack;
 }
 
-void MediaStreamTrack::getConstraints(MediaTrackConstraints& constraints) {
-  MediaConstraintsImpl::convertConstraints(m_constraints, constraints);
-}
-
 void MediaStreamTrack::setConstraints(const WebMediaConstraints& constraints) {
   m_constraints = constraints;
 }
 
 void MediaStreamTrack::getCapabilities(MediaTrackCapabilities& capabilities) {
   if (m_imageCapture)
     capabilities = m_imageCapture->getMediaTrackCapabilities();
 }
 
+void MediaStreamTrack::getConstraints(MediaTrackConstraints& constraints) {
+  MediaConstraintsImpl::convertConstraints(m_constraints, constraints);
+
+  if (!m_imageCapture)
+    return;
+  HeapVector<MediaTrackConstraintSet> vector;
+  if (constraints.hasAdvanced())
+    vector = constraints.advanced();
+  // TODO(mcasas): consider consolidating this code in MediaContraintsImpl.
+  auto imageCaptureConstraints = m_imageCapture->getMediaTrackConstraints();
+  // TODO(mcasas): add |torch|, https://crbug.com/700607.
+  if (imageCaptureConstraints.hasWhiteBalanceMode() ||
+      imageCaptureConstraints.hasExposureMode() ||
+      imageCaptureConstraints.hasFocusMode() ||
+      imageCaptureConstraints.hasExposureCompensation() ||
+      imageCaptureConstraints.hasColorTemperature() ||
+      imageCaptureConstraints.hasIso() ||
+      imageCaptureConstraints.hasBrightness() ||
+      imageCaptureConstraints.hasContrast() ||
+      imageCaptureConstraints.hasSaturation() ||
+      imageCaptureConstraints.hasSharpness() ||
+      imageCaptureConstraints.hasZoom()) {
+    // Add image capture constraints, if any, as another entry to advanced().
+    vector.emplace_back(imageCaptureConstraints);
+    constraints.setAdvanced(vector);
+  }
+}
+
 void MediaStreamTrack::getSettings(MediaTrackSettings& settings) {
   WebMediaStreamTrack::Settings platformSettings;
   m_component->getSettings(platformSettings);
-  if (platformSettings.hasFrameRate()) {
+  if (platformSettings.hasFrameRate())
     settings.setFrameRate(platformSettings.frameRate);
-  }
-  if (platformSettings.hasWidth()) {
+  if (platformSettings.hasWidth())
     settings.setWidth(platformSettings.width);
-  }
-  if (platformSettings.hasHeight()) {
+  if (platformSettings.hasHeight())
     settings.setHeight(platformSettings.height);
-  }
   if (RuntimeEnabledFeatures::mediaCaptureDepthEnabled() &&
       m_component->source()->type() == MediaStreamSource::TypeVideo) {
     if (platformSettings.hasVideoKind())
       settings.setVideoKind(platformSettings.videoKind);
     if (platformSettings.hasDepthNear())
       settings.setDepthNear(platformSettings.depthNear);
     if (platformSettings.hasDepthFar())
       settings.setDepthFar(platformSettings.depthFar);
     if (platformSettings.hasFocalLengthX())
       settings.setFocalLengthX(platformSettings.focalLengthX);
@@ skipping 35 matching lines @@
     resolver->resolve();
     return promise;
   }
 
   if (!m_imageCapture) {
     resolver->reject(DOMException::create(
         NotSupportedError, "Track type not currently supported"));
     return promise;
   }
 
+  // TODO(mcasas): support more advanced constraints, https://crbug.com/700607.
   m_imageCapture->setMediaTrackConstraints(resolver, constraints.advanced()[0]);
   return promise;
 }
 
 bool MediaStreamTrack::ended() const {
   return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState() {
   if (ended())
@@ skipping 75 matching lines @@
 
 DEFINE_TRACE(MediaStreamTrack) {
   visitor->trace(m_registeredMediaStreams);
   visitor->trace(m_component);
   visitor->trace(m_imageCapture);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink