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

Commit 13f9b2f2 authored by Jayant Chowdhary's avatar Jayant Chowdhary
Browse files

cameraserver: Add HAL plumbing + capture request verification for quad bayer sensor apis. 



- Verify that for 'high resolution' sensors, capture requests have
  sensor pixel modes which are consistent with what their output targets
  were configured with.

- Add support for
@3.7::ICameraDevice::isSessionConfigurationSupported_3_7
@3.7::ICameraDevice::configureStreams_3_7
@2.7::ICameraProvider::isConcurrentSessionConfigurationSupported_2_7

- For ZoomRatio(Distortion)Mapper, use MAXIMUM_RESOLUTION variants of SENSOR_INFO*
  and LENS_CALIBRATION / LENS_DISTORTION while doing coordinate calculations.

Bug: 152813564

Test: Camera CTS
Test: Camera binder tests

Change-Id: I41a86a55e619b25e17e701955ba8c345013329b9
Signed-off-by: default avatarJayant Chowdhary <jchowdhary@google.com>
parent b6be3c4c

camera/camera2/OutputConfiguration.cpp

+44 −6
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ bool OutputConfiguration::isMultiResolution() const { 
    return mIsMultiResolution;

}



const std::vector<int32_t> &OutputConfiguration::getSensorPixelModesUsed() const {

    return mSensorPixelModesUsed;

}



OutputConfiguration::OutputConfiguration() :

        mRotation(INVALID_ROTATION),

        mSurfaceSetID(INVALID_SET_ID),
@@ -156,6 +160,11 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) { 
        return err;

    }



    std::vector<int32_t> sensorPixelModesUsed;

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

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

        return err;

    }

    mRotation = rotation;

    mSurfaceSetID = setID;

    mSurfaceType = surfaceType;
@@ -171,6 +180,8 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) { 
        mGbps.push_back(surface.graphicBufferProducer);

    }



    mSensorPixelModesUsed = std::move(sensorPixelModesUsed);



    ALOGV("%s: OutputConfiguration: rotation = %d, setId = %d, surfaceType = %d,"

          " physicalCameraId = %s, isMultiResolution = %d", __FUNCTION__, mRotation,

          mSurfaceSetID, mSurfaceType, String8(mPhysicalCameraId).string(), mIsMultiResolution);
@@ -240,24 +251,51 @@ status_t OutputConfiguration::writeToParcel(android::Parcel* parcel) const { 
    err = parcel->writeInt32(mIsMultiResolution ? 1 : 0);

    if (err != OK) return err;



    err = parcel->writeParcelableVector(mSensorPixelModesUsed);

    if (err != OK) return err;



    return OK;

}



template <typename T>

static bool simpleVectorsEqual(T first, T second) {

    if (first.size() != second.size()) {

        return false;

    }



    for (size_t i = 0; i < first.size(); i++) {

        if (first[i] != second[i]) {

            return false;

        }

    }

    return true;

}



bool OutputConfiguration::gbpsEqual(const OutputConfiguration& other) const {

    const std::vector<sp<IGraphicBufferProducer> >& otherGbps =

            other.getGraphicBufferProducers();

    return simpleVectorsEqual(otherGbps, mGbps);

}



    if (mGbps.size() != otherGbps.size()) {

        return false;

bool OutputConfiguration::sensorPixelModesUsedEqual(const OutputConfiguration& other) const {

    const std::vector<int32_t>& othersensorPixelModesUsed = other.getSensorPixelModesUsed();

    return simpleVectorsEqual(othersensorPixelModesUsed, mSensorPixelModesUsed);

}



    for (size_t i = 0; i < mGbps.size(); i++) {

        if (mGbps[i] != otherGbps[i]) {

            return false;

bool OutputConfiguration::sensorPixelModesUsedLessThan(const OutputConfiguration& other) const {

    const std::vector<int32_t>& spms = other.getSensorPixelModesUsed();



    if (mSensorPixelModesUsed.size() !=  spms.size()) {

        return mSensorPixelModesUsed.size() < spms.size();

    }



    for (size_t i = 0; i < spms.size(); i++) {

        if (mSensorPixelModesUsed[i] != spms[i]) {

            return mSensorPixelModesUsed[i] < spms[i];

        }

    }



    return true;

    return false;

}



bool OutputConfiguration::gbpsLessThan(const OutputConfiguration& other) const {

camera/include/camera/camera2/OutputConfiguration.h

+11 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ public: 
    String16                   getPhysicalCameraId() const;

    bool                       isMultiResolution() const;



    // set of sensor pixel mode resolutions allowed {MAX_RESOLUTION, DEFAULT_MODE};

    const std::vector<int32_t>&            getSensorPixelModesUsed() const;

    /**

     * Keep impl up-to-date with OutputConfiguration.java in frameworks/base

     */
@@ -86,7 +88,8 @@ public: 
                mIsShared == other.mIsShared &&

                gbpsEqual(other) &&

                mPhysicalCameraId == other.mPhysicalCameraId &&

                mIsMultiResolution == other.mIsMultiResolution);

                mIsMultiResolution == other.mIsMultiResolution &&

                sensorPixelModesUsedEqual(other));

    }

    bool operator != (const OutputConfiguration& other) const {

        return !(*this == other);
@@ -120,13 +123,19 @@ public: 
        if (mIsMultiResolution != other.mIsMultiResolution) {

            return mIsMultiResolution < other.mIsMultiResolution;

        }

        if (!sensorPixelModesUsedEqual(other)) {

            return sensorPixelModesUsedLessThan(other);

        }

        return gbpsLessThan(other);

    }



    bool operator > (const OutputConfiguration& other) const {

        return (*this != other && !(*this < other));

    }



    bool gbpsEqual(const OutputConfiguration& other) const;

    bool sensorPixelModesUsedEqual(const OutputConfiguration& other) const;

    bool sensorPixelModesUsedLessThan(const OutputConfiguration& other) const;

    bool gbpsLessThan(const OutputConfiguration& other) const;

    void addGraphicProducer(sp<IGraphicBufferProducer> gbp) {mGbps.push_back(gbp);}

private:
@@ -140,6 +149,7 @@ private: 
    bool                       mIsShared;

    String16                   mPhysicalCameraId;

    bool                       mIsMultiResolution;

    std::vector<int32_t>       mSensorPixelModesUsed;

};

} // namespace params

} // namespace camera2

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

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ status_t CallbackProcessor::updateStream(const Parameters &params) { 
        res = device->createStream(mCallbackWindow,

                params.previewWidth, params.previewHeight, callbackFormat,

                HAL_DATASPACE_V0_JFIF, CAMERA_STREAM_ROTATION_0, &mCallbackStreamId,

                String8());

                String8(), std::unordered_set<int32_t>{ANDROID_SENSOR_PIXEL_MODE_DEFAULT});

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for callbacks: "

                    "%s (%d)", __FUNCTION__, mId,

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

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ status_t JpegProcessor::updateStream(const Parameters &params) { 
                params.pictureWidth, params.pictureHeight,

                HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_V0_JFIF,

                CAMERA_STREAM_ROTATION_0, &mCaptureStreamId,

                String8());

                String8(), std::unordered_set<int32_t>{ANDROID_SENSOR_PIXEL_MODE_DEFAULT});

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for capture: "

                    "%s (%d)", __FUNCTION__, mId,

services/camera/libcameraservice/api1/client2/Parameters.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct Parameters { 
    int previewTransform; // set by CAMERA_CMD_SET_DISPLAY_ORIENTATION



    int pictureWidth, pictureHeight;

    // Store the picture size before they are overriden by video snapshot

    // Store the picture size before they are overridden by video snapshot

    int pictureWidthLastSet, pictureHeightLastSet;

    bool pictureSizeOverriden;