diff options
| author | James Dong <jdong@google.com> | 2011-11-04 03:43:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 03:43:51 +0000 |
| commit | e304d020503b1fc7ff873c2897ba94094b9e715f (patch) | |
| tree | 31b4711d9d6e69ec947aa226be05b208a2380c8f /libcamera | |
| parent | 44a41686c20ef46506963124a3fc11739690d6e6 (diff) | |
| parent | f9a8cbcfffd293acfe6621338377f076e2960599 (diff) | |
| download | device_samsung_crespo-e304d020503b1fc7ff873c2897ba94094b9e715f.zip device_samsung_crespo-e304d020503b1fc7ff873c2897ba94094b9e715f.tar.gz device_samsung_crespo-e304d020503b1fc7ff873c2897ba94094b9e715f.tar.bz2 | |
am f9a8cbcf: Merge "5PC11X: CAMERA: Fix CTS fail list Fix Issue 4905016 - android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>" into ics-mr1
* commit 'f9a8cbcfffd293acfe6621338377f076e2960599':
5PC11X: CAMERA: Fix CTS fail list Fix Issue 4905016 - android.hardware.cts.CameraTest.testPreviewCallbackWithBufferByCamera fails Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
Diffstat (limited to 'libcamera')
| -rwxr-xr-x | libcamera/SecCameraHWInterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 85e6288..560bdbd 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -730,7 +730,7 @@ status_t CameraHardwareSec::startPreviewInternal() } mPreviewHeap = mGetMemoryCb((int)mSecCamera->getCameraFd(), - frame_size + mFrameSizeDelta, + frame_size, kBufferCount, 0); // no cookie |