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

Commit 0ea8fa4c authored by Zhijun He's avatar Zhijun He
Browse files

Camera3: Add capture intent for ZSL capture 

Also fix the warning condition in input buffer return path.

Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
parent d8cbe4a0

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

+20 −2
Original line number Diff line number Diff line
@@ -89,8 +89,26 @@ status_t StreamingProcessor::updatePreviewRequest(const Parameters &params) { 


    Mutex::Autolock m(mMutex);

    if (mPreviewRequest.entryCount() == 0) {

        sp<Camera2Client> client = mClient.promote();

        if (client == 0) {

            ALOGE("%s: Camera %d: Client does not exist", __FUNCTION__, mId);

            return INVALID_OPERATION;

        }



        // Use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG for ZSL streaming case.

        if (client->getCameraDeviceVersion() >= CAMERA_DEVICE_API_VERSION_3_0) {

            if (params.zslMode && !params.recordingHint) {

                res = device->createDefaultRequest(CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG,

                        &mPreviewRequest);

            } else {

                res = device->createDefaultRequest(CAMERA3_TEMPLATE_PREVIEW,

                        &mPreviewRequest);

            }

        } else {

            res = device->createDefaultRequest(CAMERA2_TEMPLATE_PREVIEW,

                    &mPreviewRequest);

        }



        if (res != OK) {

            ALOGE("%s: Camera %d: Unable to create default preview request: "

                    "%s (%d)", __FUNCTION__, mId, strerror(-res), res);

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

+30 −3
Original line number Diff line number Diff line
@@ -290,18 +290,45 @@ status_t ZslProcessor3::pushToReprocess(int32_t requestId) { 
        uint8_t requestType = ANDROID_REQUEST_TYPE_REPROCESS;

        res = request.update(ANDROID_REQUEST_TYPE,

                &requestType, 1);

        if (res != OK) {

            ALOGE("%s: Unable to update request type",

                  __FUNCTION__);

            return INVALID_OPERATION;

        }



        int32_t inputStreams[1] =

                { mZslStreamId };

        if (res == OK) request.update(ANDROID_REQUEST_INPUT_STREAMS,

        res = request.update(ANDROID_REQUEST_INPUT_STREAMS,

                inputStreams, 1);

        if (res != OK) {

            ALOGE("%s: Unable to update request input streams",

                  __FUNCTION__);

            return INVALID_OPERATION;

        }



        uint8_t captureIntent =

                static_cast<uint8_t>(ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE);

        res = request.update(ANDROID_CONTROL_CAPTURE_INTENT,

                &captureIntent, 1);

        if (res != OK ) {

            ALOGE("%s: Unable to update request capture intent",

                  __FUNCTION__);

            return INVALID_OPERATION;

        }



        // TODO: Shouldn't we also update the latest preview frame?

        int32_t outputStreams[1] =

                { client->getCaptureStreamId() };

        if (res == OK) request.update(ANDROID_REQUEST_OUTPUT_STREAMS,

        res = request.update(ANDROID_REQUEST_OUTPUT_STREAMS,

                outputStreams, 1);

        if (res != OK) {

            ALOGE("%s: Unable to update request output streams",

                  __FUNCTION__);

            return INVALID_OPERATION;

        }



        res = request.update(ANDROID_REQUEST_ID,

                &requestId, 1);



        if (res != OK ) {

            ALOGE("%s: Unable to update frame to a reprocess request",

                  __FUNCTION__);

services/camera/libcameraservice/common/CameraDeviceBase.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <camera/camera2/ICameraDeviceCallbacks.h>

#include "hardware/camera2.h"

#include "hardware/camera3.h"

#include "camera/CameraMetadata.h"

#include "camera/CaptureResult.h"

services/camera/libcameraservice/device3/Camera3Device.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1929,13 +1929,13 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) { 
                ALOGE("%s: RequestThread: Can't return input buffer for frame %d to"

                      "  its stream:%s (%d)",  __FUNCTION__,

                      frameNumber, strerror(-res), res);

            }

        } else {

            ALOGW("%s: Input buffer should be NULL if there is no input"

                       " buffer sent in the request",

                    " buffer sent in the request, skipping input buffer return.",

                    __FUNCTION__);

        }

    }

    }



    // Finally, signal any waiters for new frames