summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-07-30 10:12:40 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-07-31 14:11:02 -0700
commit5d64b230dc7c262575dd790299cfb667af66e014 (patch)
treeb353daab00c1b6df5fc318fa9a0b592f71d8ca04 /tests
parent85ab59a147eb67cd17a9348949d5a365bf702a5f (diff)
downloadhardware_libhardware-5d64b230dc7c262575dd790299cfb667af66e014.zip
hardware_libhardware-5d64b230dc7c262575dd790299cfb667af66e014.tar.gz
hardware_libhardware-5d64b230dc7c262575dd790299cfb667af66e014.tar.bz2
Camera2: Test logging changes
Change-Id: Idcde83d46da438726c5186cbcf8109a22aef997f
Diffstat (limited to 'tests')
-rw-r--r--tests/camera2/camera2.cpp16
1 files changed, 8 insertions, 8 deletions
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 @@ class Camera2Test: public testing::Test {
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 @@ TEST_F(Camera2Test, Capture1Raw) {
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 @@ TEST_F(Camera2Test, Capture1Raw) {
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 @@ TEST_F(Camera2Test, CaptureBurstRaw) {
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 @@ TEST_F(Camera2Test, ConstructDefaultRequests) {
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 @@ TEST_F(Camera2Test, Capture1Jpeg) {
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 @@ TEST_F(Camera2Test, Capture1Jpeg) {
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);