From 41a31123a0fc59b8112460285d3f1ba73c5537c0 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Thu, 9 Feb 2012 12:00:58 +0200 Subject: CameraHal: Reduces Camera logcat prints Change-Id: Id32ad1b882a76f091866583b15ae0ca2929bacef Signed-off-by: Emilian Peev --- camera/AppCallbackNotifier.cpp | 2 +- camera/BaseCameraAdapter.cpp | 8 +++++++- camera/CameraHal.cpp | 10 +++++----- camera/OMXCameraAdapter/OMXFD.cpp | 10 +++++----- 4 files changed, 18 insertions(+), 12 deletions(-) (limited to 'camera') diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp index 4489b1f..77b0556 100644 --- a/camera/AppCallbackNotifier.cpp +++ b/camera/AppCallbackNotifier.cpp @@ -1219,7 +1219,7 @@ bool AppCallbackNotifier::processMessage() { case NotificationThread::NOTIFIER_EXIT: { - CAMHAL_LOGI("Received NOTIFIER_EXIT command from Camera HAL"); + CAMHAL_LOGDA("Received NOTIFIER_EXIT command from Camera HAL"); mNotifierState = AppCallbackNotifier::NOTIFIER_EXITED; ret = false; break; diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp index a3d8183..69291af 100644 --- a/camera/BaseCameraAdapter.cpp +++ b/camera/BaseCameraAdapter.cpp @@ -1055,7 +1055,7 @@ status_t BaseCameraAdapter::notifyShutterSubscribers() shutterEvent.mCookie = ( void * ) mShutterSubscribers.keyAt(i); eventCb = ( event_callback ) mShutterSubscribers.valueAt(i); - CAMHAL_LOGEA("Sending shutter callback"); + CAMHAL_LOGDA("Sending shutter callback"); eventCb ( &shutterEvent ); } @@ -1697,6 +1697,12 @@ status_t BaseCameraAdapter::setState(CameraCommands operation) mNextState = INTIALIZED_STATE; break; + case CAMERA_CANCEL_AUTOFOCUS: + case CAMERA_STOP_BRACKET_CAPTURE: + case CAMERA_STOP_IMAGE_CAPTURE: + ret = INVALID_OPERATION; + break; + default: CAMHAL_LOGEB("Adapter state switch INTIALIZED_STATE Invalid Op! event = 0x%x", operation); diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 9a158f4..388adb2 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -691,7 +691,7 @@ int CameraHal::setParameters(const CameraParameters& params) if( (valstr = params.get(CameraParameters::KEY_FOCUS_AREAS)) != NULL ) { - CAMHAL_LOGI("Focus areas position set %s", params.get(CameraParameters::KEY_FOCUS_AREAS)); + CAMHAL_LOGDB("Focus areas position set %s", params.get(CameraParameters::KEY_FOCUS_AREAS)); mParameters.set(CameraParameters::KEY_FOCUS_AREAS, valstr); } @@ -908,7 +908,7 @@ int CameraHal::setParameters(const CameraParameters& params) } if( (valstr = params.get(CameraParameters::KEY_METERING_AREAS)) != NULL ) { - CAMHAL_LOGI("Metering areas position set %s", params.get(CameraParameters::KEY_METERING_AREAS)); + CAMHAL_LOGDB("Metering areas position set %s", params.get(CameraParameters::KEY_METERING_AREAS)); mParameters.set(CameraParameters::KEY_METERING_AREAS, valstr); } @@ -1429,7 +1429,7 @@ status_t CameraHal::startPreview() ///If we don't have the preview callback enabled and display adapter, if(!mSetPreviewWindowCalled || (mDisplayAdapter.get() == NULL)){ - CAMHAL_LOGI("Preview not started. Preview in progress flag set"); + CAMHAL_LOGDA("Preview not started. Preview in progress flag set"); mPreviewStartInProgress = true; ret = mCameraAdapter->sendCommand(CameraAdapter::CAMERA_SWITCH_TO_EXECUTING); if ( NO_ERROR != ret ){ @@ -1658,13 +1658,13 @@ status_t CameraHal::setPreviewWindow(struct preview_stream_ops *window) if(mDisplayAdapter.get() != NULL) { ///NULL window passed, destroy the display adapter if present - CAMHAL_LOGI("NULL window passed, destroying display adapter"); + CAMHAL_LOGDA("NULL window passed, destroying display adapter"); mDisplayAdapter.clear(); ///@remarks If there was a window previously existing, we usually expect another valid window to be passed by the client ///@remarks so, we will wait until it passes a valid window to begin the preview again mSetPreviewWindowCalled = false; } - CAMHAL_LOGI("NULL ANativeWindow passed to setPreviewWindow"); + CAMHAL_LOGDA("NULL ANativeWindow passed to setPreviewWindow"); return NO_ERROR; }else if(mDisplayAdapter.get() == NULL) { diff --git a/camera/OMXCameraAdapter/OMXFD.cpp b/camera/OMXCameraAdapter/OMXFD.cpp index dbebe79..55723b0 100644 --- a/camera/OMXCameraAdapter/OMXFD.cpp +++ b/camera/OMXCameraAdapter/OMXFD.cpp @@ -228,19 +228,19 @@ status_t OMXCameraAdapter::detectFaces(OMX_BUFFERHEADERTYPE* pBuffHeader, platformPrivate->pMetaDataBuffer, platformPrivate->nMetaDataSize); } else { - CAMHAL_LOGEB("OMX_TI_PLATFORMPRIVATE size mismatch: expected = %d, received = %d", + CAMHAL_LOGDB("OMX_TI_PLATFORMPRIVATE size mismatch: expected = %d, received = %d", ( unsigned int ) sizeof(OMX_TI_PLATFORMPRIVATE), ( unsigned int ) platformPrivate->nSize); return -EINVAL; } } else { - CAMHAL_LOGEA("Invalid OMX_TI_PLATFORMPRIVATE"); + CAMHAL_LOGDA("Invalid OMX_TI_PLATFORMPRIVATE"); return-EINVAL; } if ( 0 >= platformPrivate->nMetaDataSize ) { - CAMHAL_LOGEB("OMX_TI_PLATFORMPRIVATE nMetaDataSize is size is %d", + CAMHAL_LOGDB("OMX_TI_PLATFORMPRIVATE nMetaDataSize is size is %d", ( unsigned int ) platformPrivate->nMetaDataSize); return -EINVAL; } @@ -257,7 +257,7 @@ status_t OMXCameraAdapter::detectFaces(OMX_BUFFERHEADERTYPE* pBuffHeader, extraData->nPortIndex, extraData->nVersion); } else { - CAMHAL_LOGEA("Invalid OMX_OTHER_EXTRADATATYPE"); + CAMHAL_LOGDA("Invalid OMX_OTHER_EXTRADATATYPE"); return -EINVAL; } @@ -272,7 +272,7 @@ status_t OMXCameraAdapter::detectFaces(OMX_BUFFERHEADERTYPE* pBuffHeader, faceData->nPortIndex, faceData->nVersion); } else { - CAMHAL_LOGEB("OMX_FACEDETECTIONTYPE size mismatch: expected = %d, received = %d", + CAMHAL_LOGDB("OMX_FACEDETECTIONTYPE size mismatch: expected = %d, received = %d", ( unsigned int ) sizeof(OMX_FACEDETECTIONTYPE), ( unsigned int ) faceData->nSize); return -EINVAL; -- cgit v1.2.3