Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 65736718: Merge change 24283 into eclair

Browse Source 
Merge commit '657367185652f9877eb232b84e16fbed0d759f87' into eclair-plus-aosp

* commit '657367185652f9877eb232b84e16fbed0d759f87':
  CameraService change for OVERLAY_FORMAT_DEFAULT
This commit is contained in:
Snigdha Sinha
2009-09-10 08:35:00 -07:00
committed by Android Git Automerger
parent c6f6253ad2 6573671856
commit b870e14ad6
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
camera/libcameraservice/CameraService.cpp
View File

@@ -552,17 +552,6 @@ status_t CameraService::Client::setOverlay()
CameraParameters params(mHardware->getParameters()); CameraParameters params(mHardware->getParameters());
params.getPreviewSize(&w, &h); params.getPreviewSize(&w, &h);
const char *format = params.getPreviewFormat();
int fmt;
if (!strcmp(format, "yuv422i-yuyv"))
fmt = OVERLAY_FORMAT_YCbYCr_422_I;
else if (!strcmp(format, "rgb565"))
fmt = OVERLAY_FORMAT_RGB_565;
else {
LOGE("Invalid preview format for overlays");
return -EINVAL;
}
if ( w != mOverlayW || h != mOverlayH ) if ( w != mOverlayW || h != mOverlayH )
{ {
// Force the destruction of any previous overlay // Force the destruction of any previous overlay
@@ -574,7 +563,7 @@ status_t CameraService::Client::setOverlay()
status_t ret = NO_ERROR; status_t ret = NO_ERROR;
if (mSurface != 0) { if (mSurface != 0) {
if (mOverlayRef.get() == NULL) { if (mOverlayRef.get() == NULL) {
mOverlayRef = mSurface->createOverlay(w, h, fmt); mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);
if ( mOverlayRef.get() == NULL ) if ( mOverlayRef.get() == NULL )
{ {
LOGE("Overlay Creation Failed!"); LOGE("Overlay Creation Failed!");