diff options
| author | James Dong <jdong@google.com> | 2011-11-03 20:39:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-03 20:39:40 -0700 |
| commit | f9a8cbcfffd293acfe6621338377f076e2960599 (patch) | |
| tree | 11aa35bc0941622623fab43178ab5c13a5124ec1 /libcamera | |
| parent | 2a860e0febedc15f3078129c34d7a4e455e94f38 (diff) | |
| parent | 2c396692ddb59fd050915e6c16e34ca112405a61 (diff) | |
| download | device_samsung_crespo-f9a8cbcfffd293acfe6621338377f076e2960599.zip device_samsung_crespo-f9a8cbcfffd293acfe6621338377f076e2960599.tar.gz device_samsung_crespo-f9a8cbcfffd293acfe6621338377f076e2960599.tar.bz2 | |
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
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 6e9ff8b..adf36ba 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 |