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
commitedb86fe540cf45668909daa5b529f63804562105 (patch)
tree53eb1a8a6a1ab7db575c5fe4aee9d309092b7ce3
parentee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65 (diff)
parent475391897f0886aae1833d5e8b2e5aea47cc36bb (diff)
downloadframeworks_av-edb86fe540cf45668909daa5b529f63804562105.zip
frameworks_av-edb86fe540cf45668909daa5b529f63804562105.tar.gz
frameworks_av-edb86fe540cf45668909daa5b529f63804562105.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());