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

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

camera: Remove deprecated QCOM camera hacks 

Change-Id: If48c5b7c904d26ec2a8307fa690f983660fd7b5a
parent eb1b6869

services/camera/libcameraservice/api1/CameraClient.cpp

+0 −27
Original line number Diff line number Diff line
@@ -89,9 +89,7 @@ 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
@@ -256,16 +254,9 @@ void CameraClient::disconnect() { 


    // Release the held ANativeWindow resources.

    if (mPreviewWindow != 0) {

#ifdef QCOM_HARDWARE

#ifndef NO_UPDATE_PREVIEW

        mHardware->setPreviewWindow(0);

#endif

#endif

        disconnectWindow(mPreviewWindow);

        mPreviewWindow = 0;

#ifndef QCOM_HARDWARE

        mHardware->setPreviewWindow(mPreviewWindow);

#endif

    }

    mHardware.clear();
@@ -304,15 +295,6 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, 
            native_window_set_buffers_transform(window.get(), mOrientation);

            result = mHardware->setPreviewWindow(window);

        }

#ifdef QCOM_HARDWARE

#ifndef NO_UPDATE_PREVIEW

    } else {

        if (window != 0) {

            native_window_set_buffers_transform(window.get(), mOrientation);

        }

        result = mHardware->setPreviewWindow(window);

#endif

#endif

    }



    if (result == NO_ERROR) {
@@ -373,9 +355,6 @@ status_t CameraClient::setPreviewCallbackTarget( 
// start preview mode

status_t CameraClient::startPreview() {

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

#ifdef QCOM_HARDWARE

    enableMsgType(CAMERA_MSG_PREVIEW_METADATA);

#endif

    return startCameraMode(CAMERA_PREVIEW_MODE);

}
@@ -466,9 +445,6 @@ 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;
@@ -608,9 +584,6 @@ status_t CameraClient::takePicture(int msgType) { 
    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");

services/camera/libcameraservice/device1/CameraHardwareInterface.h

+0 −6
Original line number Diff line number Diff line
@@ -108,12 +108,6 @@ public: 
        ALOGV("%s(%s) buf %p", __FUNCTION__, mName.string(), buf.get());



        if (mDevice->ops->set_preview_window) {

#ifdef QCOM_HARDWARE

            ALOGV("%s buf %p mPreviewWindow %p", __FUNCTION__, buf.get(), mPreviewWindow.get());

            if (mPreviewWindow.get() && (buf.get() != mPreviewWindow.get())) {

                 mDevice->ops->set_preview_window(mDevice, 0);

            }

#endif

            mPreviewWindow = buf;

            mHalPreviewWindow.user = this;

            ALOGV("%s &mHalPreviewWindow %p mHalPreviewWindow.user %p", __FUNCTION__,