1 files changed, 64 insertions, 4 deletions
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs
index 60b99c7fb23..b89762c3779 100644
--- a/components/script/dom/mediadevices.rs
+++ b/components/script/dom/mediadevices.rs
@@ -4,6 +4,9 @@
 
 use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::MediaStreamConstraints;
 use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::{self, MediaDevicesMethods};
+use crate::dom::bindings::codegen::UnionTypes::BooleanOrMediaTrackConstraints;
+use crate::dom::bindings::codegen::UnionTypes::ClampedUnsignedLongOrConstrainULongRange as ConstrainULong;
+use crate::dom::bindings::codegen::UnionTypes::DoubleOrConstrainDoubleRange as ConstrainDouble;
 use crate::dom::bindings::reflector::reflect_dom_object;
 use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
@@ -12,6 +15,7 @@ use crate::dom::globalscope::GlobalScope;
 use crate::dom::mediastream::MediaStream;
 use crate::dom::promise::Promise;
 use dom_struct::dom_struct;
+use servo_media::streams::capture::{Constrain, ConstrainRange, MediaTrackConstraintSet};
 use servo_media::ServoMedia;
 use std::rc::Rc;
 
@@ -42,13 +46,13 @@ impl MediaDevicesMethods for MediaDevices {
         let p = Promise::new(&self.global());
         let media = ServoMedia::get().unwrap();
         let mut tracks = vec![];
-        if constraints.audio {
-            if let Some(audio) = media.create_audioinput_stream(Default::default()) {
+        if let Some(constraints) = convert_constraints(&constraints.audio) {
+            if let Some(audio) = media.create_audioinput_stream(constraints) {
                 tracks.push(audio)
             }
         }
-        if constraints.video {
-            if let Some(video) = media.create_videoinput_stream(Default::default()) {
+        if let Some(constraints) = convert_constraints(&constraints.video) {
+            if let Some(video) = media.create_videoinput_stream(constraints) {
                 tracks.push(video)
             }
         }
@@ -57,3 +61,59 @@ impl MediaDevicesMethods for MediaDevices {
         p
     }
 }
+
+fn convert_constraints(js: &BooleanOrMediaTrackConstraints) -> Option<MediaTrackConstraintSet> {
+    match js {
+        BooleanOrMediaTrackConstraints::Boolean(false) => None,
+        BooleanOrMediaTrackConstraints::Boolean(true) => Some(Default::default()),
+        BooleanOrMediaTrackConstraints::MediaTrackConstraints(ref c) => {
+            Some(MediaTrackConstraintSet {
+                height: convert_culong(&c.parent.height),
+                width: convert_culong(&c.parent.width),
+                aspect: convert_cdouble(&c.parent.aspectRatio),
+                frame_rate: convert_cdouble(&c.parent.frameRate),
+                sample_rate: convert_culong(&c.parent.sampleRate),
+            })
+        },
+    }
+}
+
+fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> {
+    match js {
+        ConstrainULong::ClampedUnsignedLong(val) => Some(Constrain::Value(*val)),
+        ConstrainULong::ConstrainULongRange(ref range) => {
+            if range.parent.min.is_some() || range.parent.max.is_some() {
+                Some(Constrain::Range(ConstrainRange {
+                    min: range.parent.min,
+                    max: range.parent.max,
+                    ideal: range.ideal,
+                }))
+            } else if let Some(exact) = range.exact {
+                Some(Constrain::Value(exact))
+            } else {
+                // the unspecified case is treated as all three being none
+                None
+            }
+        },
+    }
+}
+
+fn convert_cdouble(js: &ConstrainDouble) -> Option<Constrain<f64>> {
+    match js {
+        ConstrainDouble::Double(val) => Some(Constrain::Value(**val)),
+        ConstrainDouble::ConstrainDoubleRange(ref range) => {
+            if range.parent.min.is_some() || range.parent.max.is_some() {
+                Some(Constrain::Range(ConstrainRange {
+                    min: range.parent.min.map(|x| *x),
+                    max: range.parent.max.map(|x| *x),
+                    ideal: range.ideal.map(|x| *x),
+                }))
+            } else if let Some(exact) = range.exact {
+                Some(Constrain::Value(*exact))
+            } else {
+                // the unspecified case is treated as all three being none
+                None
+            }
+        },
+    }
+}