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

Commit 47ef192f authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev 

* commit 'a11111f9':
  DO NOT MERGE: Camera: fix focusArea wrong indexing issue
  DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
  DO NOT MERGE: camera2/3: Add protection for still capture path
parents bfc26066 a11111f9

services/camera/libcameraservice/api1/Camera2Client.cpp

+8 −6
Original line number Diff line number Diff line
@@ -406,12 +406,6 @@ void Camera2Client::disconnect() { 
        l.mParameters.state = Parameters::DISCONNECTED;

    }



    mStreamingProcessor->deletePreviewStream();

    mStreamingProcessor->deleteRecordingStream();

    mJpegProcessor->deleteStream();

    mCallbackProcessor->deleteStream();

    mZslProcessor->deleteStream();



    mStreamingProcessor->requestExit();

    mFrameProcessor->requestExit();

    mCaptureSequencer->requestExit();
@@ -428,6 +422,14 @@ void Camera2Client::disconnect() { 
    mZslProcessorThread->join();

    mCallbackProcessor->join();



    ALOGV("Camera %d: Deleting streams", mCameraId);



    mStreamingProcessor->deletePreviewStream();

    mStreamingProcessor->deleteRecordingStream();

    mJpegProcessor->deleteStream();

    mCallbackProcessor->deleteStream();

    mZslProcessor->deleteStream();



    ALOGV("Camera %d: Disconnecting device", mCameraId);



    mDevice->disconnect();

services/camera/libcameraservice/api1/client2/JpegProcessor.cpp

+44 −35
Original line number Diff line number Diff line
@@ -200,9 +200,17 @@ status_t JpegProcessor::processNewCapture() { 
    ATRACE_CALL();

    status_t res;

    sp<Camera2Heap> captureHeap;

    sp<MemoryBase> captureBuffer;



    CpuConsumer::LockedBuffer imgBuffer;



    {

        Mutex::Autolock l(mInputMutex);

        if (mCaptureStreamId == NO_STREAM) {

            ALOGW("%s: Camera %d: No stream is available", __FUNCTION__, mId);

            return INVALID_OPERATION;

        }



        res = mCaptureConsumer->lockNextBuffer(&imgBuffer);

        if (res != OK) {

            if (res != BAD_VALUE) {
@@ -239,11 +247,12 @@ status_t JpegProcessor::processNewCapture() { 
        }



        // TODO: Optimize this to avoid memcopy

    sp<MemoryBase> captureBuffer = new MemoryBase(mCaptureHeap, 0, jpegSize);

        captureBuffer = new MemoryBase(mCaptureHeap, 0, jpegSize);

        void* captureMemory = mCaptureHeap->getBase();

        memcpy(captureMemory, imgBuffer.data, jpegSize);



        mCaptureConsumer->unlockBuffer(imgBuffer);

    }



    sp<CaptureSequencer> sequencer = mSequencer.promote();

    if (sequencer != 0) {

services/camera/libcameraservice/api1/client2/Parameters.cpp

+14 −14
Original line number Diff line number Diff line
@@ -1858,23 +1858,23 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { 


    size_t reqFocusingAreasSize = focusingAreas.size() * 5;

    int32_t *reqFocusingAreas = new int32_t[reqFocusingAreasSize];

    for (size_t i = 0; i < reqFocusingAreasSize; i += 5) {

        if (focusingAreas[i].weight != 0) {

    for (size_t i = 0, j = 0; i < reqFocusingAreasSize; i += 5, j++) {

        if (focusingAreas[j].weight != 0) {

            reqFocusingAreas[i + 0] =

                    normalizedXToArray(focusingAreas[i].left);

                    normalizedXToArray(focusingAreas[j].left);

            reqFocusingAreas[i + 1] =

                    normalizedYToArray(focusingAreas[i].top);

                    normalizedYToArray(focusingAreas[j].top);

            reqFocusingAreas[i + 2] =

                    normalizedXToArray(focusingAreas[i].right);

                    normalizedXToArray(focusingAreas[j].right);

            reqFocusingAreas[i + 3] =

                    normalizedYToArray(focusingAreas[i].bottom);

                    normalizedYToArray(focusingAreas[j].bottom);

        } else {

            reqFocusingAreas[i + 0] = 0;

            reqFocusingAreas[i + 1] = 0;

            reqFocusingAreas[i + 2] = 0;

            reqFocusingAreas[i + 3] = 0;

        }

        reqFocusingAreas[i + 4] = focusingAreas[i].weight;

        reqFocusingAreas[i + 4] = focusingAreas[j].weight;

    }

    res = request->update(ANDROID_CONTROL_AF_REGIONS,

            reqFocusingAreas, reqFocusingAreasSize);
@@ -1887,23 +1887,23 @@ status_t Parameters::updateRequest(CameraMetadata *request) const { 


    size_t reqMeteringAreasSize = meteringAreas.size() * 5;

    int32_t *reqMeteringAreas = new int32_t[reqMeteringAreasSize];

    for (size_t i = 0; i < reqMeteringAreasSize; i += 5) {

        if (meteringAreas[i].weight != 0) {

    for (size_t i = 0, j = 0; i < reqMeteringAreasSize; i += 5, j++) {

        if (meteringAreas[j].weight != 0) {

            reqMeteringAreas[i + 0] =

                normalizedXToArray(meteringAreas[i].left);

                normalizedXToArray(meteringAreas[j].left);

            reqMeteringAreas[i + 1] =

                normalizedYToArray(meteringAreas[i].top);

                normalizedYToArray(meteringAreas[j].top);

            reqMeteringAreas[i + 2] =

                normalizedXToArray(meteringAreas[i].right);

                normalizedXToArray(meteringAreas[j].right);

            reqMeteringAreas[i + 3] =

                normalizedYToArray(meteringAreas[i].bottom);

                normalizedYToArray(meteringAreas[j].bottom);

        } else {

            reqMeteringAreas[i + 0] = 0;

            reqMeteringAreas[i + 1] = 0;

            reqMeteringAreas[i + 2] = 0;

            reqMeteringAreas[i + 3] = 0;

        }

        reqMeteringAreas[i + 4] = meteringAreas[i].weight;

        reqMeteringAreas[i + 4] = meteringAreas[j].weight;

    }

    res = request->update(ANDROID_CONTROL_AE_REGIONS,

            reqMeteringAreas, reqMeteringAreasSize);