Commit: b9bba0f526490ff1a92349c54af45e31d82a33da - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revisión: b9bba0f526490ff1a92349c54af45e31d82a33da (tree)
• Tiempo: 2010-02-27 17:47:44
• Autor: Swan_Wang <swandle@gmai...>
• Commiter: Chih-Wei Huang

Log Message

enable camera preview

Cambiar Resumen

• modified: camera/libcameraservice/CameraHardware.cpp

Diferencia incremental

--- a/camera/libcameraservice/CameraHardware.cpp
+++ b/camera/libcameraservice/CameraHardware.cpp
@@ -314,20 +314,19 @@ int CameraHardware::pictureThread()
     if (mShutterCallback)
         mShutterCallback(mPictureCallbackCookie);
 
-    sp<PreviewThread> previewThread;
-    Mutex::Autolock lock(mLock);
-    previewStopped = true;
-    previewThread = mPreviewThread;
-    if (previewThread != 0) {
-        previewThread->requestExitAndWait();
-    }
-    mPreviewThread.clear();
-    // Grab the photo
+    camera.Open(VIDEO_DEVICE, PREVIEW_WIDTH, PREVIEW_HEIGHT, PIXEL_FORMAT);
+    camera.Init();
+    camera.StartStreaming();
+
     if (mJpegPictureCallback) {
+        LOGD ("mJpegPictureCallback");
+
         mJpegPictureCallback(camera.GrabJpegFrame(), mPictureCallbackCookie);
     }
-    previewStopped = false;
-    mPreviewThread = new PreviewThread(this);
+
+    camera.Uninit();
+    camera.StopStreaming();
+    camera.Close();
     return NO_ERROR;
 }
 
@@ -336,6 +335,7 @@ status_t CameraHardware::takePicture(shutter_callback shutter_cb,
                                          jpeg_callback jpeg_cb,
                                          void* user)
 {
+    stopPreview();
     mShutterCallback = shutter_cb;
     mRawPictureCallback = raw_cb;
     mJpegPictureCallback = jpeg_cb;