Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8e417d0 authored by Steve Kondik's avatar Steve Kondik Committed by Ricardo Cerqueira
Browse files

camera: Re-add micromanagement of preview metadata 

 * Some devices still have issues without this fix.

Change-Id: Iae2d4410086fb38bf7f9abeee62c05cae824d436
parent a8abeff1

services/camera/libcameraservice/api1/CameraClient.cpp

+11 −1
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ status_t CameraClient::initialize(camera_module_t *module) { 


    // Enable zoom, error, focus, and metadata messages by default

    enableMsgType(CAMERA_MSG_ERROR | CAMERA_MSG_ZOOM | CAMERA_MSG_FOCUS

#ifndef QCOM_HARDWARE

                  | CAMERA_MSG_PREVIEW_METADATA 

#endif

#ifndef OMAP_ICS_CAMERA

                  | CAMERA_MSG_FOCUS_MOVE

#endif
@@ -354,6 +356,9 @@ status_t CameraClient::setPreviewCallbackTarget( 


// start preview mode

status_t CameraClient::startPreview() {

#ifdef QCOM_HARDWARE

    enableMsgType(CAMERA_MSG_PREVIEW_METADATA);

#endif

    LOG1("startPreview (pid %d)", getCallingPid());

    return startCameraMode(CAMERA_PREVIEW_MODE);

}
@@ -445,6 +450,9 @@ status_t CameraClient::startRecordingMode() { 
// stop preview mode

void CameraClient::stopPreview() {

    LOG1("stopPreview (pid %d)", getCallingPid());

#ifdef QCOM_HARDWARE

    disableMsgType(CAMERA_MSG_PREVIEW_METADATA);

#endif

    Mutex::Autolock lock(mLock);

    if (checkPidAndHardware() != NO_ERROR) return;
@@ -583,7 +591,9 @@ status_t CameraClient::takePicture(int msgType) { 
#if defined(OMAP_ICS_CAMERA) || defined(OMAP_ENHANCEMENT_BURST_CAPTURE)

    picMsgType |= CAMERA_MSG_COMPRESSED_BURST_IMAGE;

#endif



#ifdef QCOM_HARDWARE

    disableMsgType(CAMERA_MSG_PREVIEW_METADATA);

#endif

    enableMsgType(picMsgType);

#ifdef QCOM_HARDWARE

    mBurstCnt = mHardware->getParameters().getInt("num-snaps-per-shutter");