diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-07-28 17:23:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-28 17:23:27 -0700 |
| commit | 4c058ea3c6179484e9df793912bea6dbc2859e3d (patch) | |
| tree | 78cf9c40e8b40b6c99d24563eae7e06f272a3eb5 | |
| parent | 1d83b0f42fe8a38e10546fdc0195d85fa5d194b9 (diff) | |
| parent | 94d61946588b3f5a9fc71b725cd15fcd37f7cca0 (diff) | |
| download | device_samsung_crespo-4c058ea3c6179484e9df793912bea6dbc2859e3d.zip device_samsung_crespo-4c058ea3c6179484e9df793912bea6dbc2859e3d.tar.gz device_samsung_crespo-4c058ea3c6179484e9df793912bea6dbc2859e3d.tar.bz2 | |
Merge "Use new camera data callback."
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index dbfed28..c316ea6 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -680,7 +680,7 @@ int CameraHardwareSec::previewThread() callbacks: // Notify the client of a new frame. if (mMsgEnabled & CAMERA_MSG_PREVIEW_FRAME) - mDataCb(CAMERA_MSG_PREVIEW_FRAME, mPreviewHeap, index, mCallbackCookie); + mDataCb(CAMERA_MSG_PREVIEW_FRAME, mPreviewHeap, index, NULL, mCallbackCookie); Mutex::Autolock lock(mRecordLock); if (mRecordRunning == true) { @@ -1203,7 +1203,7 @@ int CameraHardwareSec::pictureThread() memcpy(mRawHeap->data, PostviewHeap->base(), postviewHeapSize); if (mMsgEnabled & CAMERA_MSG_RAW_IMAGE) { - mDataCb(CAMERA_MSG_RAW_IMAGE, mRawHeap, 0, mCallbackCookie); + mDataCb(CAMERA_MSG_RAW_IMAGE, mRawHeap, 0, NULL, mCallbackCookie); } if (mMsgEnabled & CAMERA_MSG_COMPRESSED_IMAGE) { @@ -1225,7 +1225,7 @@ int CameraHardwareSec::pictureThread() memmove(ImageStart, ExifStart, JpegImageSize - 2); memcpy(ExifStart, ExifHeap->data, JpegExifSize); - mDataCb(CAMERA_MSG_COMPRESSED_IMAGE, JpegHeap, 0, mCallbackCookie); + mDataCb(CAMERA_MSG_COMPRESSED_IMAGE, JpegHeap, 0, NULL, mCallbackCookie); } LOG_TIME_END(0) |