Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html

Issue 2806743003: Image Capture: split {white_balance,exposure,focus}_modes into current_ and supported_ (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« media/capture/video/linux/v4l2_capture_delegate.cc ('K') | « media/capture/video/linux/v4l2_capture_delegate.cc ('k') | third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html » ('j') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <script src="../resources/testharness.js"></script> 2 <script src="../resources/testharness.js"></script>
3 <script src="../resources/testharnessreport.js"></script> 3 <script src="../resources/testharnessreport.js"></script>
4 <script src="../resources/mojo-helpers.js"></script> 4 <script src="../resources/mojo-helpers.js"></script>
5 <script src="resources/mock-imagecapture.js"></script> 5 <script src="resources/mock-imagecapture.js"></script>
6 <body> 6 <body>
7 <canvas id='canvas' width=10 height=10/> 7 <canvas id='canvas' width=10 height=10/>
8 </body> 8 </body>
9 <script> 9 <script>
10 10
(...skipping 22 matching lines...) Expand all
33 var videoTrack = stream.getVideoTracks()[0]; 33 var videoTrack = stream.getVideoTracks()[0];
34 assert_equals(typeof videoTrack.getCapabilities, 'function'); 34 assert_equals(typeof videoTrack.getCapabilities, 'function');
35 35
36 // |videoTrack|s capabilities, just like the actual capture, is a process 36 // |videoTrack|s capabilities, just like the actual capture, is a process
37 // kicked right after creation, we introduce a small delay to allow for 37 // kicked right after creation, we introduce a small delay to allow for
38 // those to be collected. 38 // those to be collected.
39 setTimeout(() => { 39 setTimeout(() => {
40 capabilities = videoTrack.getCapabilities(); 40 capabilities = videoTrack.getCapabilities();
41 assert_equals(typeof capabilities, 'object'); 41 assert_equals(typeof capabilities, 'object');
42 42
43 // TODO(mcasas): Change the following checks when the supported modes 43 assert_equals(capabilities.whiteBalanceMode.length,
44 // are changed to a list: https://crbug.com/700607. 44 mock_capabilities.supported_white_balance_modes.length,
45 assert_equals(capabilities.focusMode[0], 45 'whiteBalanceMode');
46 meteringModeNames[mock_capabilities.focus_mode], 'focusMode'); 46 for (i = 0; i < capabilities.whiteBalanceMode.length; ++i) {
47 assert_equals(
48 capabilities.whiteBalanceMode[i],
49 meteringModeNames[mock_capabilities
50 .supported_white_balance_modes[i]],
51 'whiteBalanceMode');
52 }
47 53
48 assert_equals(capabilities.exposureMode[0], 54 assert_equals(capabilities.exposureMode.length,
49 meteringModeNames[mock_capabilities.exposure_mode], 'exposureMode;') ; 55 mock_capabilities.supported_exposure_modes.length,
56 'exposureMode');
57 for (i = 0; i < capabilities.exposureMode.length; ++i) {
58 assert_equals(
59 capabilities.exposureMode[i],
60 meteringModeNames[mock_capabilities.supported_exposure_modes[i]],
61 'exposureMode');
62 }
50 63
51 assert_equals(capabilities.whiteBalanceMode[0], 64 assert_equals(capabilities.focusMode.length,
52 meteringModeNames[mock_capabilities.white_balance_mode], 65 mock_capabilities.supported_focus_modes.length,
53 'whiteBalanceMode'); 66 'focusMode');
67 for (i = 0; i < capabilities.focusMode.length; ++i) {
68 assert_equals(
69 capabilities.focusMode[i],
70 meteringModeNames[mock_capabilities.supported_focus_modes[i]],
71 'focusMode');
72 }
54 73
55 assert_true(capabilities.exposureCompensation instanceof 74 assert_true(capabilities.exposureCompensation instanceof
56 MediaSettingsRange); 75 MediaSettingsRange);
57 assert_equals(capabilities.exposureCompensation.max, 76 assert_equals(capabilities.exposureCompensation.max,
58 mock_capabilities.exposure_compensation.max); 77 mock_capabilities.exposure_compensation.max);
59 assert_equals(capabilities.exposureCompensation.min, 78 assert_equals(capabilities.exposureCompensation.min,
60 mock_capabilities.exposure_compensation.min); 79 mock_capabilities.exposure_compensation.min);
61 assert_equals(capabilities.exposureCompensation.step, 80 assert_equals(capabilities.exposureCompensation.step,
62 mock_capabilities.exposure_compensation.step); 81 mock_capabilities.exposure_compensation.step);
63 82
64 assert_true(capabilities.colorTemperature instanceof MediaSettingsRange) ; 83 assert_true(capabilities.colorTemperature instanceof
84 MediaSettingsRange);
65 assert_equals(capabilities.colorTemperature.max, 85 assert_equals(capabilities.colorTemperature.max,
66 mock_capabilities.color_temperature.max); 86 mock_capabilities.color_temperature.max);
67 assert_equals(capabilities.colorTemperature.min, 87 assert_equals(capabilities.colorTemperature.min,
68 mock_capabilities.color_temperature.min); 88 mock_capabilities.color_temperature.min);
69 assert_equals(capabilities.colorTemperature.step, 89 assert_equals(capabilities.colorTemperature.step,
70 mock_capabilities.color_temperature.step); 90 mock_capabilities.color_temperature.step);
71 91
72 assert_true(capabilities.iso instanceof MediaSettingsRange); 92 assert_true(capabilities.iso instanceof MediaSettingsRange);
73 assert_equals(capabilities.iso.max, mock_capabilities.iso.max); 93 assert_equals(capabilities.iso.max, mock_capabilities.iso.max);
74 assert_equals(capabilities.iso.min, mock_capabilities.iso.min); 94 assert_equals(capabilities.iso.min, mock_capabilities.iso.min);
75 assert_equals(capabilities.iso.step, mock_capabilities.iso.step); 95 assert_equals(capabilities.iso.step, mock_capabilities.iso.step);
76 96
77 assert_true(capabilities.brightness instanceof MediaSettingsRange); 97 assert_true(capabilities.brightness instanceof MediaSettingsRange);
78 assert_equals(capabilities.brightness.max, 98 assert_equals(capabilities.brightness.max,
79 mock_capabilities.brightness.max); 99 mock_capabilities.brightness.max);
80 assert_equals(capabilities.brightness.min, 100 assert_equals(capabilities.brightness.min,
81 mock_capabilities.brightness.min); 101 mock_capabilities.brightness.min);
82 assert_equals(capabilities.brightness.step, 102 assert_equals(capabilities.brightness.step,
83 mock_capabilities.brightness.step); 103 mock_capabilities.brightness.step);
84 104
85 assert_true(capabilities.contrast instanceof MediaSettingsRange); 105 assert_true(capabilities.contrast instanceof MediaSettingsRange);
86 assert_equals(capabilities.contrast.max, mock_capabilities.contrast.max) ; 106 assert_equals(capabilities.contrast.max,
87 assert_equals(capabilities.contrast.min, mock_capabilities.contrast.min) ; 107 mock_capabilities.contrast.max);
108 assert_equals(capabilities.contrast.min,
109 mock_capabilities.contrast.min);
88 assert_equals(capabilities.contrast.step, 110 assert_equals(capabilities.contrast.step,
89 mock_capabilities.contrast.step); 111 mock_capabilities.contrast.step);
90 112
91 assert_true(capabilities.saturation instanceof MediaSettingsRange); 113 assert_true(capabilities.saturation instanceof MediaSettingsRange);
92 assert_equals(capabilities.saturation.max, 114 assert_equals(capabilities.saturation.max,
93 mock_capabilities.saturation.max); 115 mock_capabilities.saturation.max);
94 assert_equals(capabilities.saturation.min, 116 assert_equals(capabilities.saturation.min,
95 mock_capabilities.saturation.min); 117 mock_capabilities.saturation.min);
96 assert_equals(capabilities.saturation.step, 118 assert_equals(capabilities.saturation.step,
97 mock_capabilities.saturation.step); 119 mock_capabilities.saturation.step);
98 120
99 assert_true(capabilities.sharpness instanceof MediaSettingsRange); 121 assert_true(capabilities.sharpness instanceof MediaSettingsRange);
100 assert_equals(capabilities.sharpness.max, 122 assert_equals(capabilities.sharpness.max,
101 mock_capabilities.sharpness.max); 123 mock_capabilities.sharpness.max);
102 assert_equals(capabilities.sharpness.min, 124 assert_equals(capabilities.sharpness.min,
103 mock_capabilities.sharpness.min); 125 mock_capabilities.sharpness.min);
104 assert_equals(capabilities.sharpness.step, 126 assert_equals(capabilities.sharpness.step,
105 mock_capabilities.sharpness.step); 127 mock_capabilities.sharpness.step);
106 128
107 assert_true(capabilities.zoom instanceof MediaSettingsRange); 129 assert_true(capabilities.zoom instanceof MediaSettingsRange);
108 assert_equals(capabilities.zoom.max, mock_capabilities.zoom.max); 130 assert_equals(capabilities.zoom.max, mock_capabilities.zoom.max);
109 assert_equals(capabilities.zoom.min, mock_capabilities.zoom.min); 131 assert_equals(capabilities.zoom.min, mock_capabilities.zoom.min);
110 assert_equals(capabilities.zoom.step, mock_capabilities.zoom.step); 132 assert_equals(capabilities.zoom.step, mock_capabilities.zoom.step);
111 133
112 assert_equals(capabilities.torch, mock_capabilities.supports_torch, 'tor ch'); 134 assert_equals(capabilities.torch, mock_capabilities.supports_torch,
135 'torch');
113 136
114 t.done(); 137 t.done();
115 }, 100); 138 }, 100);
116 }, 139 },
117 error => { 140 error => {
118 assert_unreached("Error creating MockImageCapture: " + error); 141 assert_unreached("Error creating MockImageCapture: " + error);
119 }) 142 })
120 143
121 }, 'exercises MediaStreamTrack.getCapabilities()'); 144 }, 'exercises MediaStreamTrack.getCapabilities()');
122 145
123 </script> 146 </script>
OLDNEW
« media/capture/video/linux/v4l2_capture_delegate.cc ('K') | « media/capture/video/linux/v4l2_capture_delegate.cc ('k') | third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html » ('j') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698