CameraITS: Use dynamic black levels where available.
Bug: 30090008
Change-Id: I3074c2051d3919917128ba460a5f534142d56b65
diff --git a/apps/CameraITS/tests/scene1/test_dng_noise_model.py b/apps/CameraITS/tests/scene1/test_dng_noise_model.py
index 2e3ecbb..b7ba0e8 100644
--- a/apps/CameraITS/tests/scene1/test_dng_noise_model.py
+++ b/apps/CameraITS/tests/scene1/test_dng_noise_model.py
@@ -47,9 +47,7 @@
its.caps.per_frame_control(props))
white_level = float(props['android.sensor.info.whiteLevel'])
- black_levels = props['android.sensor.blackLevelPattern']
cfa_idxs = its.image.get_canonical_cfa_order(props)
- black_levels = [black_levels[i] for i in cfa_idxs]
# Expose for the scene with min sensitivity
sens_min, sens_max = props['android.sensor.info.sensitivityRange']
@@ -79,8 +77,10 @@
# non-uniform lighting or vignetting doesn't affect the variance
# calculation).
plane = its.image.convert_capture_to_planes(cap, props)[ch]
- plane = (plane * white_level - black_levels[ch]) / (
- white_level - black_levels[ch])
+ black_level = its.image.get_black_level(
+ ch, props, cap["metadata"])
+ plane = (plane * white_level - black_level) / (
+ white_level - black_level)
tile = its.image.get_image_patch(plane, 0.49,0.49,0.02,0.02)
mean = tile.mean()