omap4xxx: camera: various fixes

clean up resources properly on exit:

- Frees all resources in case of error during
  preview buffer allocation in ANativeDisplayAdadapter.
- Fixes a couple of typos in BaseCameraAdapter.
- Removes a possible memory leak during temporal
  bracketing. 'stopBracketing()' will never get
  properly executed when 'startImageCapture()'
  disables 'mBracketingEnabled'.
- Stops temporal bracketing properly inside
  'signalEndImageCapture()'.

Change-Id: Ic122058c835e30f12f335a288164475b8f6d1c6d
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp
index fd051e5..9670e4c 100644
--- a/camera/BaseCameraAdapter.cpp
+++ b/camera/BaseCameraAdapter.cpp
@@ -411,13 +411,13 @@ status_t BaseCameraAdapter::sendCommand(CameraCommands operation, int value1, in
                         mPreviewDataBuffersAvailable.clear();
                         for ( uint32_t i = 0 ; i < desc->mMaxQueueable ; i++ )
                             {
-                            mPreviewDataBuffersAvailable.add(mPreviewDataBuffers[i], true);
+                            mPreviewDataBuffersAvailable.add(mPreviewDataBuffers[i], 0);
                             }
                         // initial ref count for undeqeueued buffers is 1 since buffer provider
                         // is still holding on to it
                         for ( uint32_t i = desc->mMaxQueueable ; i < desc->mCount ; i++ )
                             {
-                            mPreviewDataBuffersAvailable.add(mPreviewBuffers[i], 1);
+                            mPreviewDataBuffersAvailable.add(mPreviewDataBuffers[i], 1);
                             }
                         }
 
@@ -464,13 +464,13 @@ status_t BaseCameraAdapter::sendCommand(CameraCommands operation, int value1, in
                     mCaptureBuffersAvailable.clear();
                     for ( uint32_t i = 0 ; i < desc->mMaxQueueable ; i++ )
                         {
-                        mCaptureBuffersAvailable.add(mCaptureBuffers[i], true);
+                        mCaptureBuffersAvailable.add(mCaptureBuffers[i], 0);
                         }
                     // initial ref count for undeqeueued buffers is 1 since buffer provider
                     // is still holding on to it
                     for ( uint32_t i = desc->mMaxQueueable ; i < desc->mCount ; i++ )
                         {
-                        mCaptureBuffersAvailable.add(mPreviewBuffers[i], 1);
+                        mCaptureBuffersAvailable.add(mCaptureBuffers[i], 1);
                         }
                     }
 
@@ -1821,6 +1821,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
             switch ( operation )
                 {
                 case CAMERA_STOP_IMAGE_CAPTURE:
+                case CAMERA_STOP_BRACKET_CAPTURE:
                     CAMHAL_LOGDB("Adapter state switch CAPTURE_STATE->PREVIEW_STATE event = 0x%x",
                                  operation);
                     mNextState = PREVIEW_STATE;
@@ -1841,6 +1842,7 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
             switch ( operation )
                 {
 
+                case CAMERA_STOP_IMAGE_CAPTURE:
                 case CAMERA_STOP_BRACKET_CAPTURE:
                     CAMHAL_LOGDB("Adapter state switch BRACKETING_STATE->PREVIEW_STATE event = 0x%x",
                                  operation);