Remove old-style constraints from Chrome internals

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

 /*
  * Copyright (C) 2012 Google Inc. 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 28 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/mediastream/MediaTrackConstraintSet.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
+
 namespace MediaConstraintsImpl {
 
+// Old type/value form of constraint. Used in parsing old-style constraints.
+struct WebMediaConstraint {
+    WebMediaConstraint()
+    {
+    }
+
+    WebMediaConstraint(WebString name, WebString value)
+        : m_name(name)
+        , m_value(value)
+    {
+    }
+
+    WebString m_name;
+    WebString m_value;
+};
+
+
+
 // Legal constraint names.
 // Temporary Note: Comments about source are where they are copied from.
 // Once the chrome parts use the new-style constraint values, they will
 // be deleted from the files mentioned.
 // TODO(hta): remove comments before https://crbug.com/543997 is closed.
 
 // From content/renderer/media/media_stream_video_source.cc
 const char kMinAspectRatio[] = "minAspectRatio";
 const char kMaxAspectRatio[] = "maxAspectRatio";
 const char kMaxWidth[] = "maxWidth";
@@ skipping 55 matching lines @@
 const char kCombinedAudioVideoBwe[] = "googCombinedAudioVideoBwe";
 const char kScreencastMinBitrate[] = "googScreencastMinBitrate";
 const char kCpuOveruseDetection[] = "googCpuOveruseDetection";
 const char kCpuUnderuseThreshold[] = "googCpuUnderuseThreshold";
 const char kCpuOveruseThreshold[] = "googCpuOveruseThreshold";
 const char kCpuUnderuseEncodeRsdThreshold[] = "googCpuUnderuseEncodeRsdThreshold";
 const char kCpuOveruseEncodeRsdThreshold[] = "googCpuOveruseEncodeRsdThreshold";
 const char kCpuOveruseEncodeUsage[] = "googCpuOveruseEncodeUsage";
 const char kHighStartBitrate[] = "googHighStartBitrate";
 const char kPayloadPadding[] = "googPayloadPadding";
+// From webrtc_audio_capturer
+const char kAudioLatency[] = "latencyMs";
+// From media_stream_video_capturer_source
+
 // End of names from libjingle
 // Names that have been used in the past, but should now be ignored.
 // Kept around for backwards compatibility.
 // https://crbug.com/579729
 const char kGoogLeakyBucket[] = "googLeakyBucket";
-
+const char kPowerLineFrequency[] = "googPowerLineFrequency";
 // Names used for testing.
 const char kTestConstraint1[] = "valid_and_supported_1";
 const char kTestConstraint2[] = "valid_and_supported_2";
 
 static bool parseMandatoryConstraintsDictionary(const Dictionary& mandatoryConstraintsDictionary, WebVector<WebMediaConstraint>& mandatory)
 {
     Vector<WebMediaConstraint> mandatoryConstraintsVector;
     HashMap<String, String> mandatoryConstraintsHashMap;
     bool ok = mandatoryConstraintsDictionary.getOwnPropertiesAsStringHashMap(mandatoryConstraintsHashMap);
     if (!ok)
@@ skipping 166 matching lines @@
             result.googHighpassFilter.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kGoogTypingNoiseDetection)) {
             result.googTypingNoiseDetection.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kGoogAudioMirroring)) {
             result.googAudioMirroring.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kDAEchoCancellation)) {
             result.googDAEchoCancellation.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kNoiseReduction)) {
             result.googNoiseReduction.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kOfferToReceiveAudio)) {
-            result.offerToReceiveAudio.setExact(constraint.m_value);
+            // This constraint has formerly been defined both as a boolean
+            // and as an integer. Allow both forms.
+            if (constraint.m_value.equals("true"))
+                result.offerToReceiveAudio.setExact(1);
+            else if (constraint.m_value.equals("false"))
+                result.offerToReceiveAudio.setExact(0);
+            else
+                result.offerToReceiveAudio.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kOfferToReceiveVideo)) {
-            result.offerToReceiveVideo.setExact(constraint.m_value);
+            // This constraint has formerly been defined both as a boolean
+            // and as an integer. Allow both forms.
+            if (constraint.m_value.equals("true"))
+                result.offerToReceiveVideo.setExact(1);
+            else if (constraint.m_value.equals("false"))
+                result.offerToReceiveVideo.setExact(0);
+            else
+                result.offerToReceiveVideo.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kVoiceActivityDetection)) {
             result.voiceActivityDetection.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kIceRestart)) {
             result.iceRestart.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kUseRtpMux)) {
             result.googUseRtpMux.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kEnableDtlsSrtp)) {
             result.enableDtlsSrtp.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kEnableRtpDataChannels)) {
             result.enableRtpDataChannels.setExact(toBoolean(constraint.m_value));
@@ skipping 18 matching lines @@
         } else if (constraint.m_name.equals(kCpuUnderuseEncodeRsdThreshold)) {
             result.googCpuUnderuseEncodeRsdThreshold.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kCpuOveruseEncodeRsdThreshold)) {
             result.googCpuOveruseEncodeRsdThreshold.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kCpuOveruseEncodeUsage)) {
             result.googCpuOveruseEncodeUsage.setExact(toBoolean(constraint.m_value));
         } else if (constraint.m_name.equals(kHighStartBitrate)) {
             result.googHighStartBitrate.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kPayloadPadding)) {
             result.googPayloadPadding.setExact(toBoolean(constraint.m_value));
+        } else if (constraint.m_name.equals(kAudioLatency)) {
+            result.googLatencyMs.setExact(atoi(constraint.m_value.utf8().c_str()));
+        } else if (constraint.m_name.equals(kPowerLineFrequency)) {
+            result.googPowerLineFrequency.setExact(atoi(constraint.m_value.utf8().c_str()));
         } else if (constraint.m_name.equals(kGoogLeakyBucket)) {
             context->addConsoleMessage(ConsoleMessage::create(DeprecationMessageSource, WarningMessageLevel,
                 "Obsolete constraint named " + String(constraint.m_name)
                 + " is ignored. Please stop using it."));
         } else if (constraint.m_name.equals(kTestConstraint1)
             || constraint.m_name.equals(kTestConstraint2)) {
             // These constraints are only for testing parsing.
             // Values 0 and 1 are legal, all others are a ConstraintError.
             if (!constraint.m_value.equals("0") && !constraint.m_value.equals("1")) {
                 errorState.throwConstraintError("Illegal value for constraint", constraint.m_name);
@@ skipping 18 matching lines @@
 {
     WebMediaTrackConstraintSet basic;
     WebMediaTrackConstraintSet advanced;
     WebMediaConstraints constraints;
     parseOldStyleNames(context, mandatory, true, basic, errorState);
     if (errorState.hadException())
         return constraints;
     // We ignore unknow names and syntax errors in optional constraints.
     MediaErrorState ignoredErrorState;
     parseOldStyleNames(context, optional, false, advanced, ignoredErrorState);
-    WebVector<WebMediaTrackConstraintSet> advancedVector(&advanced, 1);
-    // Use the 4-argument initializer until Chrome has been converted.
-    constraints.initialize(optional, mandatory, basic, advancedVector);
+    if (advanced.isEmpty()) {
+        WebVector<WebMediaTrackConstraintSet> emptyVector;
+        constraints.initialize(basic, emptyVector);
+    } else {
+        WebVector<WebMediaTrackConstraintSet> advancedVector(&advanced, 1);
+        constraints.initialize(basic, advancedVector);
+    }
     return constraints;
 }
 
 // Deprecated.
 WebMediaConstraints create(ExecutionContext* context, const Dictionary& constraintsDictionary, MediaErrorState& errorState)
 {
     WebVector<WebMediaConstraint> optional;
     WebVector<WebMediaConstraint> mandatory;
     if (!parse(constraintsDictionary, optional, mandatory)) {
         errorState.throwTypeError("Malformed constraints object.");
@@ skipping 127 matching lines @@
 
 WebMediaConstraints create()
 {
     WebMediaConstraints constraints;
     constraints.initialize();
     return constraints;
 }
 
 } // namespace MediaConstraintsImpl
 } // namespace blink