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

Commit 0e13db3b authored by Bharatt Kukreja's avatar Bharatt Kukreja
Browse files

Add autoframing tags for physical cameras 

Default values for autoframing tags should be given for both logical and
physical cameras.

An additional minor correction to the default value for
autoframingOverride in camera3device.

Test: atest LogicalCameraDeviceTest#testBasicPhysicalStreaming
Bug: 259826253
Change-Id: I69b96a8ec59e65bb6f51f57dba639177514e1cea
parent 795cd7f9

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2924,7 +2924,7 @@ Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent, 
        mCurrentAfTriggerId(0),

        mCurrentPreCaptureTriggerId(0),

        mRotateAndCropOverride(ANDROID_SCALER_ROTATE_AND_CROP_NONE),

        mAutoframingOverride(ANDROID_CONTROL_AUTOFRAMING_ON),

        mAutoframingOverride(ANDROID_CONTROL_AUTOFRAMING_OFF),

        mComposerOutput(false),

        mCameraMute(ANDROID_SENSOR_TEST_PATTERN_MODE_OFF),

        mCameraMuteChanged(false),

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+40 −17
Original line number Diff line number Diff line
@@ -128,6 +128,36 @@ status_t fixupMonochromeTags( 
    return res;

}



status_t fixupAutoframingTags(CameraMetadata& resultMetadata) {

    status_t res = OK;

    camera_metadata_entry autoframingEntry =

            resultMetadata.find(ANDROID_CONTROL_AUTOFRAMING);

    if (autoframingEntry.count == 0) {

        const uint8_t defaultAutoframingEntry = ANDROID_CONTROL_AUTOFRAMING_OFF;

        res = resultMetadata.update(ANDROID_CONTROL_AUTOFRAMING, &defaultAutoframingEntry, 1);

        if (res != OK) {

            ALOGE("%s: Failed to update ANDROID_CONTROL_AUTOFRAMING: %s (%d)",

                  __FUNCTION__, strerror(-res), res);

            return res;

        }

    }



    camera_metadata_entry autoframingStateEntry =

            resultMetadata.find(ANDROID_CONTROL_AUTOFRAMING_STATE);

    if (autoframingStateEntry.count == 0) {

        const uint8_t defaultAutoframingStateEntry = ANDROID_CONTROL_AUTOFRAMING_STATE_INACTIVE;

        res = resultMetadata.update(ANDROID_CONTROL_AUTOFRAMING_STATE,

                                    &defaultAutoframingStateEntry, 1);

        if (res != OK) {

            ALOGE("%s: Failed to update ANDROID_CONTROL_AUTOFRAMING_STATE: %s (%d)",

                  __FUNCTION__, strerror(-res), res);

            return res;

        }

    }



    return res;

}



void correctMeteringRegions(camera_metadata_t *meta) {

    if (meta == nullptr) return;
@@ -355,24 +385,17 @@ void sendCaptureResult( 
    }



    // Fix up autoframing metadata

    camera_metadata_entry autoframingEntry =

            captureResult.mMetadata.find(ANDROID_CONTROL_AUTOFRAMING);

    if (autoframingEntry.count == 0) {

        const uint8_t defaultAutoframingEntry = ANDROID_CONTROL_AUTOFRAMING_OFF;

        if (captureResult.mMetadata.update(ANDROID_CONTROL_AUTOFRAMING,

                &defaultAutoframingEntry, 1) != OK) {

            SET_ERR("Failed to set autoframing mode in metadata for frame %d", frameNumber);

    res = fixupAutoframingTags(captureResult.mMetadata);

    if (res != OK) {

        SET_ERR("Failed to set autoframing defaults in result metadata: %s (%d)",

                strerror(-res), res);

        return;

    }

    }



    camera_metadata_entry autoframingStateEntry =

            captureResult.mMetadata.find(ANDROID_CONTROL_AUTOFRAMING_STATE);

    if (autoframingStateEntry.count == 0) {

        const uint8_t defaultAutoframingStateEntry = ANDROID_CONTROL_AUTOFRAMING_STATE_INACTIVE;

        if (captureResult.mMetadata.update(ANDROID_CONTROL_AUTOFRAMING_STATE,

                &defaultAutoframingStateEntry, 1) != OK) {

            SET_ERR("Failed to set autoframing state in metadata for frame %d", frameNumber);

    for (auto& physicalMetadata : captureResult.mPhysicalMetadatas) {

        res = fixupAutoframingTags(physicalMetadata.mPhysicalCameraMetadata);

        if (res != OK) {

            SET_ERR("Failed to set autoframing defaults in physical result metadata: %s (%d)",

                    strerror(-res), res);

            return;

        }

    }