From 0667de7038238c31af77865eb6d83c5ae9ca1b1e Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 3 Sep 2010 16:40:32 -0700 Subject: Only enable CAMERA_MSG_PREVIEW_FRAME when necessary. Now camera driver uses ANativeWindow for display. CameraService should not request preview callback from camera hardware if applications have not requested it. bug:2951018 Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5 --- services/camera/libcameraservice/CameraService.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'services/camera') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index d1fbf17..e5889bf 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -567,16 +567,10 @@ void CameraService::Client::setPreviewCallbackFlag(int callback_flag) { if (checkPidAndHardware() != NO_ERROR) return; mPreviewCallbackFlag = callback_flag; - - // If we don't use overlay, we always need the preview frame for display. - // If we do use overlay, we only need the preview frame if the user - // wants the data. - if (mUseOverlay) { - if(mPreviewCallbackFlag & FRAME_CALLBACK_FLAG_ENABLE_MASK) { - enableMsgType(CAMERA_MSG_PREVIEW_FRAME); - } else { - disableMsgType(CAMERA_MSG_PREVIEW_FRAME); - } + if (mPreviewCallbackFlag & FRAME_CALLBACK_FLAG_ENABLE_MASK) { + enableMsgType(CAMERA_MSG_PREVIEW_FRAME); + } else { + disableMsgType(CAMERA_MSG_PREVIEW_FRAME); } } @@ -636,7 +630,6 @@ status_t CameraService::Client::startPreviewMode() { } else { // XXX: Set the orientation of the ANativeWindow. mHardware->setPreviewWindow(mPreviewWindow); - enableMsgType(CAMERA_MSG_PREVIEW_FRAME); result = mHardware->startPreview(); } return result; @@ -1025,9 +1018,7 @@ void CameraService::Client::handlePreviewData(const sp& mem) { mPreviewCallbackFlag &= ~(FRAME_CALLBACK_FLAG_ONE_SHOT_MASK | FRAME_CALLBACK_FLAG_COPY_OUT_MASK | FRAME_CALLBACK_FLAG_ENABLE_MASK); - if (mUseOverlay) { - disableMsgType(CAMERA_MSG_PREVIEW_FRAME); - } + disableMsgType(CAMERA_MSG_PREVIEW_FRAME); } if (c != 0) { -- cgit v1.1