diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2016-10-31 16:55:07 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-11-02 13:41:35 -0700 |
commit | dfe279aa91466b6e8d31b7b637badad574b795ec (patch) | |
tree | 8c13ebe8fea03457812acb81524901b7e94b284b | |
parent | 4574cbd7578d23fbe9046e7e8bf19260315edda9 (diff) | |
download | cts-nougat-mr1.6-release.tar.gz |
CameraITS: fix key errorandroid-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10nougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-releasenougat-mr1-flounder-release
Test: python tests/scene1/test_capture_result.py
Bug: 32549961
Change-Id: Ia30a0ba6c468bcf28093f76f6507c72039248cc0
(cherry picked from commit 20fc15a3e50dfc0b872ab834371dd87de7d944be)
-rw-r--r-- | apps/CameraITS/tests/scene1/test_capture_result.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/apps/CameraITS/tests/scene1/test_capture_result.py b/apps/CameraITS/tests/scene1/test_capture_result.py index ec919f83eb7..cde37c2d0d3 100644 --- a/apps/CameraITS/tests/scene1/test_capture_result.py +++ b/apps/CameraITS/tests/scene1/test_capture_result.py @@ -77,11 +77,11 @@ def main(): h_map = props["android.lens.info.shadingMapSize"]["height"] print "Testing auto capture results" - lsc_map_auto = test_auto(cam, w_map, h_map) + lsc_map_auto = test_auto(cam, w_map, h_map, props) print "Testing manual capture results" - test_manual(cam, w_map, h_map, lsc_map_auto) + test_manual(cam, w_map, h_map, lsc_map_auto, props) print "Testing auto capture results again" - test_auto(cam, w_map, h_map) + test_auto(cam, w_map, h_map, props) # A very loose definition for two floats being close to each other; # there may be different interpolation and rounding used to get the @@ -105,7 +105,7 @@ def draw_lsc_plot(w_map, h_map, lsc_map, name): ax.plot_wireframe(xs, ys, zs) matplotlib.pyplot.savefig("%s_plot_lsc_%s_ch%d.png"%(NAME,name,ch)) -def test_auto(cam, w_map, h_map): +def test_auto(cam, w_map, h_map, props): # Get 3A lock first, so the auto values in the capture result are # populated properly. rect = [[0,0,1,1,1]] @@ -124,9 +124,12 @@ def test_auto(cam, w_map, h_map): print "Gains:", gains print "Transform:", [its.objects.rational_to_float(t) for t in transform] - print "AE region:", cap_res['android.control.aeRegions'] - print "AF region:", cap_res['android.control.afRegions'] - print "AWB region:", cap_res['android.control.awbRegions'] + if props["android.control.maxRegionsAe"] > 0: + print "AE region:", cap_res['android.control.aeRegions'] + if props["android.control.maxRegionsAf"] > 0: + print "AF region:", cap_res['android.control.afRegions'] + if props["android.control.maxRegionsAwb"] > 0: + print "AWB region:", cap_res['android.control.awbRegions'] print "LSC map:", w_map, h_map, lsc_map[:8] assert(ctrl_mode == 1) @@ -154,7 +157,7 @@ def test_auto(cam, w_map, h_map): return lsc_map -def test_manual(cam, w_map, h_map, lsc_map_auto): +def test_manual(cam, w_map, h_map, lsc_map_auto, props): cap = cam.do_capture(manual_req) cap_res = cap["metadata"] @@ -172,9 +175,12 @@ def test_manual(cam, w_map, h_map, lsc_map_auto): print "Transform:", [its.objects.rational_to_float(t) for t in transform] print "Tonemap:", curves[0][1::16] - print "AE region:", cap_res['android.control.aeRegions'] - print "AF region:", cap_res['android.control.afRegions'] - print "AWB region:", cap_res['android.control.awbRegions'] + if props["android.control.maxRegionsAe"] > 0: + print "AE region:", cap_res['android.control.aeRegions'] + if props["android.control.maxRegionsAf"] > 0: + print "AF region:", cap_res['android.control.afRegions'] + if props["android.control.maxRegionsAwb"] > 0: + print "AWB region:", cap_res['android.control.awbRegions'] print "LSC map:", w_map, h_map, lsc_map[:8] assert(ctrl_mode == 0) |