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

Commit de8652cb authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

resolved conflicts for merge of 191a25e1 to master 

Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
parents cc8f44bc 191a25e1

services/camera/libcameraservice/CameraService.cpp

+13 −5
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, 
    // Callback is disabled by default

    mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;

    mOrientation = 0;

    mOrientationChanged = false;

    mPlayShutterSound = true;

    cameraService->setCameraBusy(cameraId);

    cameraService->loadSound();
@@ -491,6 +492,7 @@ status_t CameraService::Client::setPreviewDisplay(const sp<Surface>& surface) { 
            // Force the destruction of any previous overlay

            sp<Overlay> dummy;

            mHardware->setOverlay(dummy);

            mOverlayRef = 0;

        }

    }

    if (surface != 0) {
@@ -518,11 +520,12 @@ status_t CameraService::Client::setOverlay() { 
    CameraParameters params(mHardware->getParameters());

    params.getPreviewSize(&w, &h);



    if (w != mOverlayW || h != mOverlayH) {

    if (w != mOverlayW || h != mOverlayH || mOrientationChanged) {

        // Force the destruction of any previous overlay

        sp<Overlay> dummy;

        mHardware->setOverlay(dummy);

        mOverlayRef = 0;

        mOrientationChanged = false;

    }



    status_t result = NO_ERROR;
@@ -802,6 +805,7 @@ status_t CameraService::Client::enableShutterSound(bool enable) { 


status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t arg2) {

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

    int orientation;

    Mutex::Autolock lock(mLock);

    status_t result = checkPidAndHardware();

    if (result != NO_ERROR) return result;
@@ -813,20 +817,24 @@ status_t CameraService::Client::sendCommand(int32_t cmd, int32_t arg1, int32_t a 
        }

        switch (arg1) {

            case 0:

                mOrientation = ISurface::BufferHeap::ROT_0;

                orientation = ISurface::BufferHeap::ROT_0;

                break;

            case 90:

                mOrientation = ISurface::BufferHeap::ROT_90;

                orientation = ISurface::BufferHeap::ROT_90;

                break;

            case 180:

                mOrientation = ISurface::BufferHeap::ROT_180;

                orientation = ISurface::BufferHeap::ROT_180;

                break;

            case 270:

                mOrientation = ISurface::BufferHeap::ROT_270;

                orientation = ISurface::BufferHeap::ROT_270;

                break;

            default:

                return BAD_VALUE;

        }

        if (mOrientation != orientation) {

            mOrientation = orientation;

            if (mOverlayRef != 0) mOrientationChanged = true;

        }

        return OK;

    } else if (cmd == CAMERA_CMD_ENABLE_SHUTTER_SOUND) {

        switch (arg1) {

services/camera/libcameraservice/CameraService.h

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ private: 
        int                             mOverlayW;

        int                             mOverlayH;

        int                             mPreviewCallbackFlag;

        int                             mOrientation;

        int                             mOrientation;     // Current display orientation

        // True if display orientation has been changed. This is only used in overlay.

        int                             mOrientationChanged;

        bool                            mPlayShutterSound;



        // Ensures atomicity among the public methods