commit 5d64b230dc7c262575dd790299cfb667af66e014
author Eino-Ville Talvala <etalvala@google.com> Mon Jul 30 10:12:40 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Jul 31 14:11:02 2012 -0700
tree b353daab00c1b6df5fc318fa9a0b592f71d8ca04
parent 85ab59a147eb67cd17a9348949d5a365bf702a5f

Camera2: Test logging changes

Change-Id: Idcde83d46da438726c5186cbcf8109a22aef997f

tests/camera2/camera2.cpp

diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp
index 8a0e842..05f61ef 100644
--- a/tests/camera2/camera2.cpp
+++ b/tests/camera2/camera2.cpp
@@ -94,8 +94,8 @@
                 ASSERT_TRUE(NULL != info.static_camera_characteristics);
                 IF_ALOGV() {
                     std::cout << "    Static camera metadata:"  << std::endl;
-                    dump_camera_metadata(info.static_camera_characteristics,
-                            0, 1);
+                    dump_indented_camera_metadata(info.static_camera_characteristics,
+                            0, 1, 6);
                 }
             } else {
                 sCameraSupportsHal2[i] = false;
@@ -392,7 +392,7 @@
 
         IF_ALOGV() {
             std::cout << "Input request: " << std::endl;
-            dump_camera_metadata(request, 0, 1);
+            dump_indented_camera_metadata(request, 0, 1, 2);
         }
 
         res = mRequests.enqueue(request);
@@ -408,7 +408,7 @@
 
         IF_ALOGV() {
             std::cout << "Output frame:" << std::endl;
-            dump_camera_metadata(frame, 0, 1);
+            dump_indented_camera_metadata(frame, 0, 1, 2);
         }
 
         res = rawWaiter->waitForFrame(exposureTime + SEC);
@@ -502,7 +502,7 @@
 
         IF_ALOGV() {
             std::cout << "Input request template: " << std::endl;
-            dump_camera_metadata(request, 0, 1);
+            dump_indented_camera_metadata(request, 0, 1, 2);
         }
 
         int numCaptures = 10;
@@ -598,7 +598,7 @@
 
             IF_ALOGV() {
                 std::cout << "  ** Template type " << i << ":"<<std::endl;
-                dump_camera_metadata(request, 0, 2);
+                dump_indented_camera_metadata(request, 0, 2, 4);
             }
 
             free_camera_metadata(request);
@@ -668,7 +668,7 @@
 
         IF_ALOGV() {
             std::cout << "Input request: " << std::endl;
-            dump_camera_metadata(request, 0, 1);
+            dump_indented_camera_metadata(request, 0, 1, 4);
         }
 
         res = mRequests.enqueue(request);
@@ -684,7 +684,7 @@
 
         IF_ALOGV() {
             std::cout << "Output frame:" << std::endl;
-            dump_camera_metadata(frame, 0, 1);
+            dump_indented_camera_metadata(frame, 0, 1, 4);
         }
 
         res = jpegWaiter->waitForFrame(exposureTime + SEC);