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

Commit 555f5b4d authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Fix physical camera metadata accounting for MRIR 

If a MRIR (MultiResolutionImageReader) is requested
together with a physical stream, the accounting
of expected physical camera metadata needs to consider the case
where the physical camera Id of the requested physical stream
matches the activePhysicalCameraId.

Flag: EXEMPT bugfix
Bug: 435162253
Test: vendor testing and Camera CTS
Change-Id: I6b214540e4394f950f20e094884178720d729637
parent 480dd4ff

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+26 −2
Original line number Diff line number Diff line
@@ -616,6 +616,27 @@ const std::set<std::string>& getCameraIdsWithZoomLocked( 
    return r.cameraIdsWithZoom;

}



size_t getExpectedPhysicalMetadataCount(

        const std::set<std::set<std::string>>& requestedPhysicalIds,

        const std::string& activePhysicalCameraId) {

    std::set<std::string> expectedPhysicalIdsWithMetadata;

    for (const auto& requestedId : requestedPhysicalIds) {

        if (requestedId.size() == 1) {

            // RequestedId is a single physical camera Id

            expectedPhysicalIdsWithMetadata.insert(*requestedId.begin());

        } else {

           // For multi-resolution ImageReader where RequestedId contains a set

           // of physical camera Ids, the expected physical camera

           // Id is the active physical camera Id.

           if (requestedId.contains(activePhysicalCameraId)) {

               expectedPhysicalIdsWithMetadata.insert(activePhysicalCameraId);

           }

        }

    }



    return expectedPhysicalIdsWithMetadata.size();

}



void processCaptureResult(CaptureOutputStates& states, const camera_capture_result *result) {

    ATRACE_CALL();
@@ -756,9 +777,12 @@ void processCaptureResult(CaptureOutputStates& states, const camera_capture_resu 


        // Did we get the (final) result metadata for this capture?

        if (result->result != NULL && !isPartialResult) {

            if (request.physicalCameraIds.size() != result->num_physcam_metadata) {

            size_t expectedPhysicalCameraMetadataCount =

                    getExpectedPhysicalMetadataCount(request.physicalCameraIds,

                                                     states.activePhysicalId);

            if (expectedPhysicalCameraMetadataCount != result->num_physcam_metadata) {

                SET_ERR("Expected physical Camera metadata count %d not equal to actual count %d",

                        request.physicalCameraIds.size(), result->num_physcam_metadata);

                        expectedPhysicalCameraMetadataCount, result->num_physcam_metadata);

                return;

            }

            if (request.haveResultMetadata) {