CameraITS: Fixed swapped U,V channels in CCM
Bug: 13537736
Change-Id: I0fc35db31481a37d17d9f1e3571ed45559c58eed
diff --git a/apps/CameraITS/pymodules/its/image.py b/apps/CameraITS/pymodules/its/image.py
index 10ddf7b..9bf51be 100644
--- a/apps/CameraITS/pymodules/its/image.py
+++ b/apps/CameraITS/pymodules/its/image.py
@@ -25,9 +25,9 @@
import cStringIO
DEFAULT_YUV_TO_RGB_CCM = numpy.matrix([
- [1.000, 1.402, 0.000],
- [1.000, -0.714, -0.344],
- [1.000, 0.000, 1.772]])
+ [1.000, 0.000, 1.402],
+ [1.000, -0.344, -0.714],
+ [1.000, 1.772, 0.000]])
DEFAULT_YUV_OFFSETS = numpy.array([0, 128, 128])
diff --git a/apps/CameraITS/tests/test_auto.py b/apps/CameraITS/tests/test_auto.py
new file mode 100644
index 0000000..c86f594
--- /dev/null
+++ b/apps/CameraITS/tests/test_auto.py
@@ -0,0 +1,35 @@
+# Copyright 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import its.image
+import its.device
+import its.objects
+import os.path
+
+def main():
+ """Just capture a YUV shot, using auto mode, and save as a JPEG.
+ """
+ NAME = os.path.basename(__file__).split(".")[0]
+
+ with its.device.ItsSession() as cam:
+ req = its.objects.auto_capture_request()
+ rect = [0,0,1,1]
+ sens, exp, gains, xform, focus = cam.do_3a(rect, rect, rect)
+ cap = cam.do_capture(req)
+ img = its.image.convert_capture_to_rgb_image(cap)
+ its.image.write_image(img, "%s.jpg" % (NAME))
+
+if __name__ == '__main__':
+ main()
+
