commit c235df864edded100bc50c4352fd6672f16353b1
author Marco Nelissen <marcone@google.com> Tue Mar 19 17:24:04 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 19 17:24:04 2013 +0000
tree 295569c07edf824f6c75c90ced6d71875f1c4e1e
parent 307c058cbded02a9c36eff40787c86473c2617ec
parent 6a5c6ed13e3ea1b19835e08624125c9b1505b32c

Merge "Fix valgrind error" into jb-mr2-dev

camera/tests/ProCameraTests.cpp

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 @@
     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 @@
 
         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 @@
                 ", 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());

services/camera/libcameraservice/Camera2Device.cpp

diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 37ba5ae..946cdba 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -426,7 +426,7 @@
         totalTime += kSleepTime;
         if (totalTime > kMaxSleepTime) {
             ALOGE("%s: Waited %d us, %d requests still in flight", __FUNCTION__,
-                    mHal2Device->ops->get_in_progress_count(mHal2Device), totalTime);
+                    totalTime, mHal2Device->ops->get_in_progress_count(mHal2Device));
             return TIMED_OUT;
         }
     }