Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add support for basic MediaTrackConstraints

Browse source
This commit is contained in:
Manish Goregaokar 2019-02-12 15:55:40 -08:00
parent 28c6dec62d
commit dd7b69b6d8
2 changed files with 75 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

45
components/script/dom/mediadevices.rs
View file

@ -4,6 +4,8 @@
use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::MediaStreamConstraints; use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::MediaStreamConstraints;
use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::{self, MediaDevicesMethods}; 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::reflector::reflect_dom_object; use crate::dom::bindings::reflector::reflect_dom_object;
use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::reflector::DomObject;
use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::root::DomRoot;
@ -12,6 +14,7 @@ use crate::dom::globalscope::GlobalScope;
use crate::dom::mediastream::MediaStream; use crate::dom::mediastream::MediaStream;
use crate::dom::promise::Promise; use crate::dom::promise::Promise;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use servo_media::streams::capture::{Constrain, ConstrainRange, MediaTrackConstraintSet};
use servo_media::ServoMedia; use servo_media::ServoMedia;
use std::rc::Rc; use std::rc::Rc;
@ -42,13 +45,13 @@ impl MediaDevicesMethods for MediaDevices {
let p = Promise::new(&self.global()); let p = Promise::new(&self.global());
let media = ServoMedia::get().unwrap(); let media = ServoMedia::get().unwrap();
let mut tracks = vec![]; let mut tracks = vec![];
if constraints.audio { if let Some(constraints) = convert_constraints(&constraints.audio) {
if let Some(audio) = media.create_audioinput_stream(Default::default()) { if let Some(audio) = media.create_audioinput_stream(constraints) {
tracks.push(audio) tracks.push(audio)
} }
} }
if constraints.video { if let Some(constraints) = convert_constraints(&constraints.video) {
if let Some(video) = media.create_videoinput_stream(Default::default()) { if let Some(video) = media.create_videoinput_stream(constraints) {
tracks.push(video) tracks.push(video)
} }
} }
@ -57,3 +60,37 @@ impl MediaDevicesMethods for MediaDevices {
p 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),
..Default::default()
})
},
}
}
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
}
},
}
}

68
components/script/dom/webidls/MediaDevices.webidl
View file

@ -23,10 +23,10 @@ partial interface MediaDevices {
dictionary MediaStreamConstraints { dictionary MediaStreamConstraints {
// (boolean or MediaTrackConstraints) video = false; (boolean or MediaTrackConstraints) video;
// (boolean or MediaTrackConstraints) audio = false; // (boolean or MediaTrackConstraints) video = false;
boolean video = false; (boolean or MediaTrackConstraints) audio;
boolean audio = false; // (boolean or MediaTrackConstraints) audio = false;
}; };
// dictionary DoubleRange { // dictionary DoubleRange {
@ -39,15 +39,15 @@ dictionary MediaStreamConstraints {
// double ideal; // double ideal;
// }; // };
// dictionary ULongRange { dictionary ULongRange {
// [Clamp] unsigned long max; [Clamp] unsigned long max;
// [Clamp] unsigned long min; [Clamp] unsigned long min;
// }; };
// dictionary ConstrainULongRange : ULongRange { dictionary ConstrainULongRange : ULongRange {
// [Clamp] unsigned long exact; [Clamp] unsigned long exact;
// [Clamp] unsigned long ideal; [Clamp] unsigned long ideal;
// }; };
// dictionary ConstrainBooleanParameters { // dictionary ConstrainBooleanParameters {
// boolean exact; // boolean exact;
@ -59,30 +59,30 @@ dictionary MediaStreamConstraints {
// (DOMString or sequence<DOMString>) ideal; // (DOMString or sequence<DOMString>) ideal;
// }; // };
// dictionary MediaTrackConstraints : MediaTrackConstraintSet { dictionary MediaTrackConstraints : MediaTrackConstraintSet {
// sequence<MediaTrackConstraintSet> advanced; sequence<MediaTrackConstraintSet> advanced;
// }; };
// typedef ([Clamp] unsigned long or ConstrainULongRange) ConstrainULong; typedef ([Clamp] unsigned long or ConstrainULongRange) ConstrainULong;
// typedef (double or ConstrainDoubleRange) ConstrainDouble; // typedef (double or ConstrainDoubleRange) ConstrainDouble;
// typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean; // typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean;
// typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString; // typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString;
// dictionary MediaTrackConstraintSet { dictionary MediaTrackConstraintSet {
// ConstrainULong width; ConstrainULong width;
// ConstrainULong height; ConstrainULong height;
// ConstrainDouble aspectRatio; // ConstrainDouble aspectRatio;
// ConstrainDouble frameRate; // ConstrainDouble frameRate;
// ConstrainDOMString facingMode; // ConstrainDOMString facingMode;
// ConstrainDOMString resizeMode; // ConstrainDOMString resizeMode;
// ConstrainDouble volume; // ConstrainDouble volume;
// ConstrainULong sampleRate; // ConstrainULong sampleRate;
// ConstrainULong sampleSize; // ConstrainULong sampleSize;
// ConstrainBoolean echoCancellation; // ConstrainBoolean echoCancellation;
// ConstrainBoolean autoGainControl; // ConstrainBoolean autoGainControl;
// ConstrainBoolean noiseSuppression; // ConstrainBoolean noiseSuppression;
// ConstrainDouble latency; // ConstrainDouble latency;
// ConstrainULong channelCount; // ConstrainULong channelCount;
// ConstrainDOMString deviceId; // ConstrainDOMString deviceId;
// ConstrainDOMString groupId; // ConstrainDOMString groupId;
// }; };