Chromium Code Reviews Chromium Code Reviews
Issue 2766473002:
Image Capture: wire getSettings() from MediaStreamTrack (Closed)
| Index: third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html |
| diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..364810c842c78d0236e9f0976a94289de6fa09e6 |
| --- /dev/null |
| +++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-applyConstraints-getSettings.html |
| @@ -0,0 +1,92 @@ |
| +<!DOCTYPE html> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| +<script src="../resources/mojo-helpers.js"></script> |
| +<script src="resources/mock-imagecapture.js"></script> |
| +<body> |
| +<canvas id='canvas' width=10 height=10/> |
| +</body> |
| +<script> |
| + |
| +// This test verifies that the |constraints| configured in the mock Mojo |
| +// service implementation, are returned by MediaStreamTrack.getSettings(). |
| + |
| +async_test(function(t) { |
| + var canvas = document.getElementById('canvas'); |
| + var context = canvas.getContext("2d"); |
| + context.fillStyle = "red"; |
| + context.fillRect(0, 0, 10, 10); |
| + |
| + |
|
Reilly Grant (use Gerrit)
2017/03/21 01:25:17
nit: extra whitespace
mcasas
2017/03/21 02:40:10
Done.
|
| + const constraints = { advanced : [{ whiteBalanceMode : "manual", |
| + exposureMode : "continuous", |
| + focusMode : "single-shot", |
| + |
| + exposureCompensation : 133.77, |
| + colorTemperature : 6000, |
| + iso : 120.0, |
| + |
| + brightness : 3, |
| + contrast : 4, |
| + saturation : 5, |
| + sharpness : 6, |
| + |
| + zoom : 3.141592 |
| + // TODO: torch https://crbug.com/700607. |
| + }]}; |
| + var theMock = null; |
| + var videoTrack = null; |
| + mockImageCaptureReady |
| + .then(mock => { |
| + theMock = mock; |
| + // |stream| must be created _after_ |mock| is constructed to give the |
| + // latter time to override the bindings. |
| + var stream = canvas.captureStream(); |
| + videoTrack = stream.getVideoTracks()[0]; |
| + |
| + return videoTrack.applyConstraints(constraints); |
| + }) |
| + .catch(error => { |
|
Reilly Grant (use Gerrit)
2017/03/21 01:25:17
To catch just errors from mockImageCapture ready t
mcasas
2017/03/21 02:40:10
Gotcha. I got it wrong in the other mock-based tes
|
| + assert_unreached("Error creating MockImageCapture: " + error.message); |
| + }) |
| + .then(function() { |
| + |
| + settings = videoTrack.getSettings(); |
| + assert_equals(typeof settings, 'object'); |
| + |
| + assert_equals(constraints.advanced[0].whiteBalanceMode, |
| + settings.whiteBalanceMode, 'whiteBalanceMode'); |
| + assert_equals(constraints.advanced[0].exposureMode, settings.exposureMode, |
| + 'exposureMode'); |
| + assert_equals(constraints.advanced[0].focusMode, settings.focusMode, |
| + 'focusMode'); |
| + |
| + assert_equals(constraints.advanced[0].exposureCompensation, |
| + settings.exposureCompensation, 'exposure_compensation'); |
| + assert_equals(constraints.advanced[0].colorTemperature, |
| + settings.colorTemperature, 'color_temperature'); |
| + assert_equals(constraints.advanced[0].iso, settings.iso, 'iso'); |
| + |
| + assert_equals(constraints.advanced[0].brightness, settings.brightness, |
| + 'brightness'); |
| + assert_equals(constraints.advanced[0].contrast, settings.contrast, |
| + 'contrast'); |
| + assert_equals(constraints.advanced[0].saturation, settings.saturation, |
| + 'saturation'); |
| + assert_equals(constraints.advanced[0].sharpness, settings.sharpness, |
| + 'sharpness'); |
| + |
| + assert_equals(constraints.advanced[0].zoom, settings.zoom, 'zoom'); |
| + |
| + // TODO(mcasas): check |torch| when the mojom interface is updated, |
| + // https://crbug.com/700607. |
| + |
| + t.done(); |
| + }) |
| + .catch(error => { |
| + assert_unreached("Error creating MockImageCapture: " + error); |
|
Reilly Grant (use Gerrit)
2017/03/21 01:25:17
Error applying constraints?
mcasas
2017/03/21 02:40:10
Done.
|
| + }); |
| + |
| +}, 'exercises an applyConstraints() - getSettings() cycle'); |
| + |
| +</script> |
