commit 228a53805808a24cb19fcf13b1f0bdc2ed89bbe1
author Eino-Ville Talvala <etalvala@google.com> Mon Aug 13 12:16:06 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Aug 20 16:08:00 2012 -0700
tree 96b41c80d1080b83e286d450daf161782fe66627
parent 3cc89794d92b833feff15ca76dfa196cc886e43f

Camera2: Add support for preview callbacks

- Move camera overall state enum to be part of parameters
- No longer use ICameraLock to guard access to overall state enum
- Add callback flag management
- Add callback stream and management

Bug: 6243944

Change-Id: Ideb3dc523a23c05e440e429ebf838b1900a96573

services/camera/libcameraservice/MediaConsumer.cpp

diff --git a/services/camera/libcameraservice/MediaConsumer.cpp b/services/camera/libcameraservice/MediaConsumer.cpp
index 0d857cf..a5fe302 100644
--- a/services/camera/libcameraservice/MediaConsumer.cpp
+++ b/services/camera/libcameraservice/MediaConsumer.cpp
@@ -81,6 +81,7 @@
 
     if (!buffer) return BAD_VALUE;
     if (mCurrentLockedBuffers == mMaxLockedBuffers) {
+        MC_LOGV("Too many buffers (max %d)", mCurrentLockedBuffers);
         return INVALID_OPERATION;
     }
 
@@ -91,6 +92,7 @@
     err = mBufferQueue->acquireBuffer(&b);
     if (err != OK) {
         if (err == BufferQueue::NO_BUFFER_AVAILABLE) {
+            MC_LOGV("No buffer available");
             return BAD_VALUE;
         } else {
             MC_LOGE("Error acquiring buffer: %s (%d)", strerror(err), err);
@@ -117,7 +119,7 @@
     *timestamp = b.mTimestamp;
 
     mCurrentLockedBuffers++;
-
+    MC_LOGV("getNextBuffer: %d buffers in use", mCurrentLockedBuffers);
     return OK;
 }
 
@@ -143,8 +145,8 @@
                 buf);
         return err;
     }
-
     mCurrentLockedBuffers--;
+    MC_LOGV("freeBuffer: %d buffers in use", mCurrentLockedBuffers);
 
     return OK;
 }