some HAL bug

3 files changed, 9 insertions, 1 deletions

diff --git a/BaseCameraAdapter.cpp b/BaseCameraAdapter.cpp
index bc342e6..5ecc829 100644
--- a/BaseCameraAdapter.cpp
+++ b/BaseCameraAdapter.cpp
@@ -589,7 +589,7 @@ status_t BaseCameraAdapter::sendCommand(CameraCommands operation, int value1, in
                 {
                 ret = stopPreview();
                 }
-
+		 ret = NO_ERROR;  /*just add it temporarily for taking picture use , will update it later */
             if ( ret == NO_ERROR )
                 {
                 ret = commitState();
diff --git a/CameraHal_Module.cpp b/CameraHal_Module.cpp
index 52b237c..d5d8d84 100644
--- a/CameraHal_Module.cpp
+++ b/CameraHal_Module.cpp
@@ -316,6 +316,7 @@ int camera_take_picture(struct camera_device * device)
     aml_dev = (aml_camera_device_t*) device;
 
     rv = gCameraHals[aml_dev->cameraid]->takePicture();
+     rv = gCameraHals[aml_dev->cameraid]->startPreview();
     return rv;
 }
 
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp
index e4d209c..04c59e8 100644
--- a/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -678,6 +678,7 @@ int V4LCameraAdapter::previewThread()
             }
 
         int width, height;
+        #if 0
         uint16_t* dest = (uint16_t*)gralloc_hnd->base; //ptr;
         uint16_t* src = (uint16_t*) fp;
         mParams.getPreviewSize(&width, &height);
@@ -697,6 +698,12 @@ int V4LCameraAdapter::previewThread()
                 }
                 //dest += 4096/2-width;
             }
+        #else 
+        uint8_t* dest = (uint8_t*)gralloc_hnd->base; //ptr;
+        uint8_t* src = (uint8_t*) fp;
+        mParams.getPreviewSize(&width, &height);
+        memcpy(dest,src,width*height*3/2);
+        #endif
 
         mParams.getPreviewSize(&width, &height);
         frame.mFrameMask = CameraFrame::PREVIEW_FRAME_SYNC;