From fd98ff8b391085a3f01bf3dcf2fffc6181e299fb Mon Sep 17 00:00:00 2001 From: Snigdha Sinha Date: Mon, 31 Aug 2009 13:02:23 -0500 Subject: CameraService change for OVERLAY_FORMAT_DEFAULT Originally from: https://partner.source.android.com/g/#change,829 --- camera/libcameraservice/CameraService.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index e66b00f8eddb..3c2dc2b6da12 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!"); -- cgit v1.2.3-59-g8ed1b