Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add aspect/frameRate/sampleRate parameters

Browse source
This commit is contained in:
Manish Goregaokar 2019-02-12 18:24:44 -08:00
parent dd7b69b6d8
commit caa05948bf
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2379,6 +2379,7 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config):
'crate::dom::bindings::conversions::root_from_handlevalue', 'crate::dom::bindings::conversions::root_from_handlevalue',
'std::ptr::NonNull', 'std::ptr::NonNull',
'crate::dom::bindings::mozmap::MozMap', 'crate::dom::bindings::mozmap::MozMap',
'crate::dom::bindings::num::Finite',
'crate::dom::bindings::root::DomRoot', 'crate::dom::bindings::root::DomRoot',
'crate::dom::bindings::str::ByteString', 'crate::dom::bindings::str::ByteString',
'crate::dom::bindings::str::DOMString', 'crate::dom::bindings::str::DOMString',

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

@ -6,6 +6,7 @@ use crate::dom::bindings::codegen::Bindings::MediaDevicesBinding::MediaStreamCon
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::BooleanOrMediaTrackConstraints;
use crate::dom::bindings::codegen::UnionTypes::ClampedUnsignedLongOrConstrainULongRange as ConstrainULong; 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::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;
@ -69,7 +70,9 @@ fn convert_constraints(js: &BooleanOrMediaTrackConstraints) -> Option<MediaTrack
Some(MediaTrackConstraintSet { Some(MediaTrackConstraintSet {
height: convert_culong(&c.parent.height), height: convert_culong(&c.parent.height),
width: convert_culong(&c.parent.width), width: convert_culong(&c.parent.width),
..Default::default() aspect: convert_cdouble(&c.parent.aspectRatio),
frame_rate: convert_cdouble(&c.parent.frameRate),
sample_rate: convert_culong(&c.parent.sampleRate),
}) })
}, },
} }
@ -94,3 +97,23 @@ fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> {
}, },
} }
} }
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
}
},
}
}

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

@ -29,15 +29,15 @@ dictionary MediaStreamConstraints {
// (boolean or MediaTrackConstraints) audio = false; // (boolean or MediaTrackConstraints) audio = false;
}; };
// dictionary DoubleRange { dictionary DoubleRange {
// double max; double max;
// double min; double min;
// }; };
// dictionary ConstrainDoubleRange : DoubleRange { dictionary ConstrainDoubleRange : DoubleRange {
// double exact; double exact;
// double ideal; double ideal;
// }; };
dictionary ULongRange { dictionary ULongRange {
[Clamp] unsigned long max; [Clamp] unsigned long max;
@ -64,19 +64,19 @@ dictionary MediaTrackConstraints : MediaTrackConstraintSet {
}; };
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;