auto import from //depot/cupcake/@132589
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 953e637..e5d4220 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -152,7 +152,7 @@
}
CameraService::Client::Client(const sp<CameraService>& cameraService,
- const sp<ICameraClient>& cameraClient, pid_t clientPid)
+ const sp<ICameraClient>& cameraClient, pid_t clientPid)
{
LOGD("Client E constructor");
mCameraService = cameraService;
@@ -429,7 +429,7 @@
ret = mHardware->startPreview(NULL, mCameraService.get());
if (ret != NO_ERROR)
LOGE("mHardware->startPreview() failed with status %d\n", ret);
-
+
} else {
ret = mHardware->startPreview(previewCallback,
mCameraService.get());
@@ -684,33 +684,13 @@
return INVALID_OPERATION;
}
+ if (mSurface != NULL && !mUseOverlay)
+ mSurface->unregisterBuffers();
- Mutex::Autolock buffer_lock(mBufferLock);
- result = mHardware->takePicture(shutterCallback,
+ return mHardware->takePicture(shutterCallback,
yuvPictureCallback,
jpegPictureCallback,
mCameraService.get());
-
- // It takes quite some time before yuvPicture callback to be called.
- // Register the buffer for raw image here to reduce latency.
- // But yuvPictureCallback is called from libcamera. So do not call into a
- // libcamera function here that gets another lock, which may cause deadlock.
- if (mSurface != 0 && !mUseOverlay) {
- int w, h;
- CameraParameters params(mHardware->getParameters());
- params.getPictureSize(&w, &h);
- mSurface->unregisterBuffers();
- uint32_t transform = 0;
- if (params.getOrientation() == CameraParameters::CAMERA_ORIENTATION_PORTRAIT) {
- LOGV("portrait mode");
- transform = ISurface::BufferHeap::ROT_90;
- }
- ISurface::BufferHeap buffers(w, h, w, h,
- PIXEL_FORMAT_YCbCr_420_SP, transform, 0, mHardware->getRawHeap());
- mSurface->registerBuffers(buffers);
- }
-
- return result;
}
// picture callback - snapshot taken
@@ -752,9 +732,23 @@
#endif
// Put the YUV version of the snapshot in the preview display.
- // Use lock to make sure buffer has been registered.
- Mutex::Autolock clientLock(client->mBufferLock);
+ int w, h;
+ CameraParameters params(client->mHardware->getParameters());
+ params.getPictureSize(&w, &h);
+
+// Mutex::Autolock clientLock(client->mLock);
if (client->mSurface != 0 && !client->mUseOverlay) {
+ client->mSurface->unregisterBuffers();
+
+ uint32_t transform = 0;
+ if (params.getOrientation() == CameraParameters::CAMERA_ORIENTATION_PORTRAIT) {
+ LOGV("portrait mode");
+ transform = ISurface::BufferHeap::ROT_90;
+ }
+ ISurface::BufferHeap buffers(w, h, w, h,
+ PIXEL_FORMAT_YCbCr_420_SP, transform, 0, heap);
+
+ client->mSurface->registerBuffers(buffers);
client->mSurface->postBuffer(offset);
}