summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-03-18 18:38:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-18 18:38:10 +0000
commite483d98763cefa19520a97c50ae4777041646974 (patch)
treed6257466c4a2c7c7648216d099c13c0b8fb6197f
parent4f4c2655dc3f6fcef766db6e793b1642ad0fd605 (diff)
parent46ee76c093796924de4e0d356220844a99d10707 (diff)
downloadframeworks_av-e483d98763cefa19520a97c50ae4777041646974.zip
frameworks_av-e483d98763cefa19520a97c50ae4777041646974.tar.gz
frameworks_av-e483d98763cefa19520a97c50ae4777041646974.tar.bz2
Merge "ProCameraTests: Minor add grey/frame count debug-only print outs" into jb-mr2-dev
-rw-r--r--camera/tests/ProCameraTests.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp
index 71813ae..ecc0854 100644
--- a/camera/tests/ProCameraTests.cpp
+++ b/camera/tests/ProCameraTests.cpp
@@ -1015,6 +1015,9 @@ TEST_F(ProCameraTest, WaitForDualStreamBuffer) {
ASSERT_NO_FATAL_FAILURE(createSubmitRequestForStreams(streams, /*count*/2,
/*requests*/REQUEST_COUNT));
+ int depthFrames = 0;
+ int greyFrames = 0;
+
// Consume two frames simultaneously. Unsynchronized by timestamps.
for (int i = 0; i < REQUEST_COUNT; ++i) {
@@ -1041,6 +1044,8 @@ TEST_F(ProCameraTest, WaitForDualStreamBuffer) {
EXPECT_OK(depthConsumer->unlockBuffer(depthBuffer));
+ depthFrames++;
+
/** Consume Greyscale frames if there are any.
* There may not be since it runs at half FPS */
@@ -1053,9 +1058,14 @@ TEST_F(ProCameraTest, WaitForDualStreamBuffer) {
", timestamp = " << greyBuffer.timestamp << std::endl;
EXPECT_OK(consumer->unlockBuffer(greyBuffer));
+
+ greyFrames++;
}
}
+ dout << "Done, summary: depth frames " << std::dec << depthFrames
+ << ", grey frames " << std::dec << greyFrames << std::endl;
+
// Done: clean up
EXPECT_OK(mCamera->deleteStream(streamId));
EXPECT_OK(mCamera->exclusiveUnlock());