CameraHal: Allocate buffers when source is set

- Allocate the buffers for a particular surface when it is
  set. This allows applications to set multiple surfaces
  before capturing or reprocessing, so they don't have to
  take the penalty of buffer allocation during.

- Partialy revert change I0c1b8854.

Depends on hardware/libhardware change I01831e05:
http://review.omapzoom.org/#/c/28152/

Change-Id: I13aa2b19387e2a21f8ca08203b132154c14d481b
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp
index f71f0c1..7d05c24 100644
--- a/camera/BufferSourceAdapter.cpp
+++ b/camera/BufferSourceAdapter.cpp
@@ -141,6 +141,8 @@ BufferSourceAdapter::~BufferSourceAdapter()
 {
     LOG_FUNCTION_NAME;
 
+    freeBufferList(mBuffers);
+
     android::AutoMutex lock(mLock);
 
     destroy();
@@ -162,12 +164,6 @@ BufferSourceAdapter::~BufferSourceAdapter()
         mReturnFrame.clear();
     }
 
-    if( mBuffers != NULL)
-    {
-        delete [] mBuffers;
-        mBuffers = NULL;
-    }
-
     LOG_FUNCTION_NAME_EXIT;
 }
 
@@ -618,7 +614,8 @@ int BufferSourceAdapter::getBufferCount() {
     int count = -1;
 
     android::Mutex::Autolock lock(mLock);
-    return NO_BUFFERS_IMAGE_CAPTURE_SYSTEM_HEAP;
+    if (mBufferSource) extendedOps()->get_buffer_count(mBufferSource, &count);
+    return count;
 }
 
 CameraBuffer* BufferSourceAdapter::getBufferList(int *num) {