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

Commit b9244570 authored by Changyeon Jo's avatar Changyeon Jo Committed by Automerger Merge Worker
Browse files

Remove color format constraints am: e6bb228d am: 9b60ecd2 am: ec0d97c8 

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



Change-Id: I1e2eb30d5563cfddff8d07479ad18a8186062a07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62be0023 ec0d97c8

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+3 −20
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ typedef struct { 
} RawStreamConfig;

constexpr const size_t kStreamCfgSz = sizeof(RawStreamConfig) / sizeof(int32_t);



const std::unordered_set<int32_t> gSupportedColorFormats ({

    HAL_PIXEL_FORMAT_RGBA_8888,

    HAL_PIXEL_FORMAT_BGRA_8888,

    HAL_PIXEL_FORMAT_YCRCB_420_SP,  // NV21

    HAL_PIXEL_FORMAT_YV12,          // YV12

    HAL_PIXEL_FORMAT_YCBCR_422_I    // YUY2

});



} // anonymous namespace
@@ -258,8 +250,7 @@ protected: 
            // Stream configurations are found in metadata

            RawStreamConfig *ptr = reinterpret_cast<RawStreamConfig *>(streamCfgs.data.i32);

            for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) {

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                    isSupportedColorFormat(ptr->format)) {

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    targetCfg.width = ptr->width;

                    targetCfg.height = ptr->height;

                    targetCfg.format = static_cast<PixelFormat>(ptr->format);
@@ -272,10 +263,6 @@ protected: 
        return targetCfg;

    }



    bool isSupportedColorFormat(int32_t format) {

        return gSupportedColorFormats.find(format) != gSupportedColorFormats.end();

    }



    sp<IEvsEnumerator>              pEnumerator;   // Every test needs access to the service

    std::vector<CameraDesc>         cameraInfo;    // Empty unless/until loadCameraList() is called

    bool                            mIsHwModule;   // boolean to tell current module under testing
@@ -2029,9 +2016,7 @@ TEST_P(EvsHidlTest, CameraUseStreamConfigToDisplay) { 
            // Stream configurations are found in metadata

            RawStreamConfig *ptr = reinterpret_cast<RawStreamConfig *>(streamCfgs.data.i32);

            for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) {

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                    isSupportedColorFormat(ptr->format)) {



                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    if (ptr->width * ptr->height > maxArea &&

                        ptr->framerate >= minReqFps) {

                        targetCfg.width = ptr->width;
@@ -2131,9 +2116,7 @@ TEST_P(EvsHidlTest, MultiCameraStreamUseConfig) { 
            // Stream configurations are found in metadata

            RawStreamConfig *ptr = reinterpret_cast<RawStreamConfig *>(streamCfgs.data.i32);

            for (unsigned offset = 0; offset < streamCfgs.count; offset += kStreamCfgSz) {

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                    isSupportedColorFormat(ptr->format)) {



                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    if (ptr->width * ptr->height > maxArea &&

                        ptr->framerate >= minReqFps) {

                        targetCfg.width = ptr->width;