diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 11:28:20 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 11:28:20 -0400 |
| commit | 657367185652f9877eb232b84e16fbed0d759f87 (patch) | |
| tree | d1cc06e044510192d8370f56ff04daab30ae1748 | |
| parent | f63e3f3cc8c61bc9eeda980f314795412eb03b79 (diff) | |
| parent | fd98ff8b391085a3f01bf3dcf2fffc6181e299fb (diff) | |
| download | frameworks_base-657367185652f9877eb232b84e16fbed0d759f87.zip frameworks_base-657367185652f9877eb232b84e16fbed0d759f87.tar.gz frameworks_base-657367185652f9877eb232b84e16fbed0d759f87.tar.bz2 | |
Merge change 24283 into eclair
* changes:
CameraService change for OVERLAY_FORMAT_DEFAULT
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index e66b00f..3c2dc2b 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -552,17 +552,6 @@ status_t CameraService::Client::setOverlay() CameraParameters params(mHardware->getParameters()); 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 ) { // Force the destruction of any previous overlay @@ -574,7 +563,7 @@ status_t CameraService::Client::setOverlay() status_t ret = NO_ERROR; if (mSurface != 0) { if (mOverlayRef.get() == NULL) { - mOverlayRef = mSurface->createOverlay(w, h, fmt); + mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT); if ( mOverlayRef.get() == NULL ) { LOGE("Overlay Creation Failed!"); |