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

Commit 0449e549 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "Camera VTS: Test only CROPPED_RAW use case for RAW_SENSOR streams" into... 

Merge "Camera VTS: Test only CROPPED_RAW use case for RAW_SENSOR streams" into android14-tests-dev am: e51dca22

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2944865



Change-Id: Id7dc9e5f08965eea3ce5f6287ea94377340d6edb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52ebf316 e51dca22

camera/provider/aidl/vts/camera_aidl_test.cpp

+6 −4
Original line number Original line Diff line number Diff line
@@ -2202,18 +2202,20 @@ void CameraAidlTest::configureStreamUseCaseInternal(const AvailableStream &thres 
        ASSERT_NE(0u, outputPreviewStreams.size());

        ASSERT_NE(0u, outputPreviewStreams.size());





        // Combine valid and invalid stream use cases

        // Combine valid and invalid stream use cases

        std::vector<int64_t> useCases(kMandatoryUseCases);

        std::vector<int64_t> testedUseCases;

        useCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW + 1);

        testedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW + 1);





        std::vector<int64_t> supportedUseCases;

        std::vector<int64_t> supportedUseCases;

        if (threshold.format == static_cast<int32_t>(PixelFormat::RAW16)) {

        if (threshold.format == static_cast<int32_t>(PixelFormat::RAW16)) {

            // If the format is RAW16, supported use case is only CROPPED_RAW.

            // If the format is RAW16, supported use case is only CROPPED_RAW.

            // All others are unsupported for this format.

            // All others are unsupported for this format.

            useCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW);

            testedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW);

            supportedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW);

            supportedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_CROPPED_RAW);

            supportedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT);

            supportedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT);

        } else {

        } else {

            camera_metadata_ro_entry entry;

            camera_metadata_ro_entry entry;

            testedUseCases.insert(testedUseCases.end(), kMandatoryUseCases.begin(),

                                  kMandatoryUseCases.end());

            auto retcode = find_camera_metadata_ro_entry(

            auto retcode = find_camera_metadata_ro_entry(

                    staticMeta, ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES, &entry);

                    staticMeta, ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES, &entry);

            if ((0 == retcode) && (entry.count > 0)) {

            if ((0 == retcode) && (entry.count > 0)) {
@@ -2254,7 +2256,7 @@ void CameraAidlTest::configureStreamUseCaseInternal(const AvailableStream &thres 
        ASSERT_TRUE(ret.isOk());

        ASSERT_TRUE(ret.isOk());

        config.sessionParams = req;

        config.sessionParams = req;





        for (int64_t useCase : useCases) {

        for (int64_t useCase : testedUseCases) {

            bool useCaseSupported = std::find(supportedUseCases.begin(), supportedUseCases.end(),

            bool useCaseSupported = std::find(supportedUseCases.begin(), supportedUseCases.end(),

                                              useCase) != supportedUseCases.end();

                                              useCase) != supportedUseCases.end();