diff options
| author | Timothy Knight <tknight@google.com> | 2014-08-21 17:31:24 -0700 |
|---|---|---|
| committer | Timothy Knight <tknight@google.com> | 2014-08-21 17:31:24 -0700 |
| commit | 2507052399d987caa46fcb32854886beb0a3443b (patch) | |
| tree | 473bf23a32fd5c444c03f385fdb67dddef68934e /apps | |
| parent | d34afe98d746884a739092b93d4ff0922cfacb84 (diff) | |
| download | pdk-2507052399d987caa46fcb32854886beb0a3443b.tar.gz | |
CameraITS: Allow G gains to be forced to be the same in manual controls.
Bug: 16963407
Change-Id: I4df91c98d3cd52abebd60f63659e31dc298793a3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CameraITS/tests/scene1/test_capture_result.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/apps/CameraITS/tests/scene1/test_capture_result.py b/apps/CameraITS/tests/scene1/test_capture_result.py index f6c982c..56bde60 100644 --- a/apps/CameraITS/tests/scene1/test_capture_result.py +++ b/apps/CameraITS/tests/scene1/test_capture_result.py @@ -35,6 +35,9 @@ def main(): manual_exp_time = 100*1000*1000 manual_sensitivity = 100 + # The camera HAL may not support different gains for the two G channels. + manual_gains_ok = [[1,2,3,4],[1,2,2,4],[1,3,3,4]] + auto_req = its.objects.auto_capture_request() auto_req["android.statistics.lensShadingMapMode"] = 1 @@ -160,8 +163,12 @@ def main(): # values as the manually set values. assert(len(gains) == 4) assert(len(transform) == 9) - assert(all([is_close_float(gains[i], manual_gains[i]) - for i in xrange(4)])) + assert( all([is_close_float(gains[i], manual_gains_ok[0][i]) + for i in xrange(4)]) or + all([is_close_float(gains[i], manual_gains_ok[1][i]) + for i in xrange(4)]) or + all([is_close_float(gains[i], manual_gains_ok[2][i]) + for i in xrange(4)])) assert(all([is_close_rational(transform[i], manual_transform[i]) for i in xrange(9)])) |