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

Commit 7184a1db authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera: Fix sensor pixel modes unparcelling in OutputConfiguration." into sc-dev

parents f37f198e 84df28c2

camera/camera2/OutputConfiguration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) { 
    }



    std::vector<int32_t> sensorPixelModesUsed;

    if ((err = parcel->readParcelableVector(&sensorPixelModesUsed)) != OK) {

    if ((err = parcel->readInt32Vector(&sensorPixelModesUsed)) != OK) {

        ALOGE("%s: Failed to read sensor pixel mode(s) from parcel", __FUNCTION__);

        return err;

    }

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+9 −2
Original line number Diff line number Diff line
@@ -669,15 +669,22 @@ status_t SessionConfigurationUtils::checkAndOverrideSensorPixelModesUsed( 
        const std::vector<int32_t> &sensorPixelModesUsed, int format, int width, int height,

        const CameraMetadata &staticInfo, bool flexibleConsumer,

        std::unordered_set<int32_t> *overriddenSensorPixelModesUsed) {



    const std::unordered_set<int32_t> &sensorPixelModesUsedSet =

            convertToSet(sensorPixelModesUsed);

    if (!isUltraHighResolutionSensor(staticInfo)) {

        if (sensorPixelModesUsedSet.find(ANDROID_SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION) !=

                sensorPixelModesUsedSet.end()) {

            // invalid value for non ultra high res sensors

            return BAD_VALUE;

        }

        overriddenSensorPixelModesUsed->clear();

        overriddenSensorPixelModesUsed->insert(ANDROID_SENSOR_PIXEL_MODE_DEFAULT);

        return OK;

    }



    StreamConfigurationPair streamConfigurationPair = getStreamConfigurationPair(staticInfo);

    const std::unordered_set<int32_t> &sensorPixelModesUsedSet =

            convertToSet(sensorPixelModesUsed);



    bool isInDefaultStreamConfigurationMap =

            inStreamConfigurationMap(format, width, height,

                    streamConfigurationPair.mDefaultStreamConfigurationMap);