diff options
| author | Simon Wilson <simonwilson@google.com> | 2010-10-29 08:20:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 08:20:00 -0700 |
| commit | 981230b3c66a002f9b2729c1722ef12a8d7f0073 (patch) | |
| tree | dd3a4f89a47785e881031df0c98fcd01ac744fb0 | |
| parent | ec8f65ed78834faa7cbf18e3b653fb6d27f5d8ae (diff) | |
| parent | 5d4d68f25c9419219fe257b57f5514cc679d5c3d (diff) | |
| download | device_samsung_crespo-981230b3c66a002f9b2729c1722ef12a8d7f0073.zip device_samsung_crespo-981230b3c66a002f9b2729c1722ef12a8d7f0073.tar.gz device_samsung_crespo-981230b3c66a002f9b2729c1722ef12a8d7f0073.tar.bz2 | |
am 5d4d68f2: am 256aeac7: libcamera: only show postview if preview size is VGA
* commit '5d4d68f25c9419219fe257b57f5514cc679d5c3d':
libcamera: only show postview if preview size is VGA
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 4a488dc..d2aaa2c 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -1155,6 +1155,14 @@ int CameraHardwareSec::pictureThread() unsigned int index = 0; unsigned int offset = ((mPostViewWidth*mPostViewHeight*3/2) + 16) * index; unsigned int overlay_header[4]; + + // Only show postview image if size is VGA since sensor cannot deliver + // any other sizes. + int previewWidth, previewHeight, previewSize; + mSecCamera->getPreviewSize(&previewWidth, &previewHeight, &previewSize); + if ((previewWidth != 640) || (previewHeight != 480)) + goto PostviewOverlayEnd; + mOverlayBufferIdx ^= 1; overlay_header[0]= mSecCamera->getPhyAddrY(index); overlay_header[1]= overlay_header[0] + mPostViewWidth*mPostViewHeight; |