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

Commit 5a4f93ea authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Camera2: Use the recordingHint parameter. 

Use recordingHint to create recording and still capture streams up
front, and to use the recording template when doing preview.

Bug: 6243944

Change-Id: Ifeb624794849f734784b53a1a10ff2bfe8f1a357
parent cf70d346

services/camera/libcameraservice/Camera2Client.cpp

+48 −21
Original line number Original line Diff line number Diff line
@@ -646,7 +646,7 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
            return res;

            return res;

        }

        }

    }

    }

    if (params.zslMode) {

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

        res = mZslProcessor->updateStream(params);

        res = mZslProcessor->updateStream(params);

        if (res != OK) {

        if (res != OK) {

            ALOGE("%s: Camera %d: Unable to update ZSL stream: %s (%d)",

            ALOGE("%s: Camera %d: Unable to update ZSL stream: %s (%d)",
@@ -655,6 +655,8 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
        }

        }

    }

    }





    CameraMetadata *request;

    if (!params.recordingHint) {

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

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

            res = updatePreviewRequest(params);

            res = updatePreviewRequest(params);

            if (res != OK) {

            if (res != OK) {
@@ -663,6 +665,39 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
                return res;

                return res;

            }

            }

        }

        }

        request = &mPreviewRequest;

    } else {

        // With recording hint set, we're going to be operating under the

        // assumption that the user will record video. To optimize recording

        // startup time, create the necessary output streams for recording and

        // video snapshot now if they don't already exist.

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

            res = updateRecordingRequest(params);

            if (res != OK) {

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

                        "request: %s (%d)",

                        __FUNCTION__, mCameraId, strerror(-res), res);

                return res;

            }

        }

        request = &mRecordingRequest;



        res = updateRecordingStream(params);

        if (res != OK) {

            ALOGE("%s: Camera %d: Unable to pre-configure recording "

                    "stream: %s (%d)",

                    __FUNCTION__, mCameraId, strerror(-res), res);

            return res;

        }



        res = mJpegProcessor->updateStream(params);

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't pre-configure still image "

                    "stream: %s (%d)",

                    __FUNCTION__, mCameraId, strerror(-res), res);

            return res;

        }

    }





    Vector<uint8_t> outputStreams;

    Vector<uint8_t> outputStreams;

    outputStreams.push(getPreviewStreamId());

    outputStreams.push(getPreviewStreamId());
@@ -670,11 +705,11 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
    if (callbacksEnabled) {

    if (callbacksEnabled) {

        outputStreams.push(getCallbackStreamId());

        outputStreams.push(getCallbackStreamId());

    }

    }

    if (params.zslMode) {

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

        outputStreams.push(getZslStreamId());

        outputStreams.push(getZslStreamId());

    }

    }





    res = mPreviewRequest.update(

    res = request->update(

        ANDROID_REQUEST_OUTPUT_STREAMS,

        ANDROID_REQUEST_OUTPUT_STREAMS,

        outputStreams);

        outputStreams);
@@ -683,14 +718,14 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 
                __FUNCTION__, mCameraId, strerror(-res), res);

                __FUNCTION__, mCameraId, strerror(-res), res);

        return res;

        return res;

    }

    }

    res = mPreviewRequest.sort();

    res = request->sort();

    if (res != OK) {

    if (res != OK) {

        ALOGE("%s: Camera %d: Error sorting preview request: %s (%d)",

        ALOGE("%s: Camera %d: Error sorting preview request: %s (%d)",

                __FUNCTION__, mCameraId, strerror(-res), res);

                __FUNCTION__, mCameraId, strerror(-res), res);

        return res;

        return res;

    }

    }





    res = mDevice->setStreamingRequest(mPreviewRequest);

    res = mDevice->setStreamingRequest(*request);

    if (res != OK) {

    if (res != OK) {

        ALOGE("%s: Camera %d: Unable to set preview request to start preview: "

        ALOGE("%s: Camera %d: Unable to set preview request to start preview: "

                "%s (%d)",

                "%s (%d)",
@@ -921,19 +956,11 @@ void Camera2Client::stopRecording() { 




    mCameraService->playSound(CameraService::SOUND_RECORDING);

    mCameraService->playSound(CameraService::SOUND_RECORDING);





    // Back to preview. Since record can only be reached through preview,

    res = startPreviewL(l.mParameters, true);

    // all preview stream setup should be up to date.

    res = mDevice->setStreamingRequest(mPreviewRequest);

    if (res != OK) {

    if (res != OK) {

        ALOGE("%s: Camera %d: Unable to switch back to preview request: "

        ALOGE("%s: Camera %d: Unable to return to preview",

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

                __FUNCTION__, mCameraId);

        return;

    }

    }



    // TODO: Should recording heap be freed? Can't do it yet since requests

    // could still be in flight.



    l.mParameters.state = Parameters::PREVIEW;

}

}





bool Camera2Client::recordingEnabled() {

bool Camera2Client::recordingEnabled() {
@@ -1627,7 +1654,7 @@ void Camera2Client::onRecordingFrameAvailable() { 




/** Utility methods */

/** Utility methods */





status_t Camera2Client::updateRequests(const Parameters &params) {

status_t Camera2Client::updateRequests(Parameters &params) {

    status_t res;

    status_t res;





    res = updatePreviewRequest(params);

    res = updatePreviewRequest(params);
@@ -1644,7 +1671,7 @@ status_t Camera2Client::updateRequests(const Parameters &params) { 
    }

    }





    if (params.state == Parameters::PREVIEW) {

    if (params.state == Parameters::PREVIEW) {

        res = mDevice->setStreamingRequest(mPreviewRequest);

        res = startPreviewL(params, true);

        if (res != OK) {

        if (res != OK) {

            ALOGE("%s: Camera %d: Error streaming new preview request: %s (%d)",

            ALOGE("%s: Camera %d: Error streaming new preview request: %s (%d)",

                    __FUNCTION__, mCameraId, strerror(-res), res);

                    __FUNCTION__, mCameraId, strerror(-res), res);

services/camera/libcameraservice/Camera2Client.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ private: 
    /** Camera device-related private members */

    /** Camera device-related private members */





    void     setPreviewCallbackFlagL(Parameters &params, int flag);

    void     setPreviewCallbackFlagL(Parameters &params, int flag);

    status_t updateRequests(const Parameters &params);

    status_t updateRequests(Parameters &params);





    // Used with stream IDs

    // Used with stream IDs

    static const int NO_STREAM = -1;

    static const int NO_STREAM = -1;