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

Commit 6e9d53e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove color format constraints" am: 463d0839 

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



Change-Id: I22880f1d5eea1a404e3965ac043c8784e3e26cfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a8a2b9d 463d0839

automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp

+5 −8
Original line number Original line Diff line number Diff line
@@ -231,8 +231,7 @@ class EvsAidlTest : public ::testing::TestWithParam<std::string> { 
            // Stream configurations are found in metadata

            // Stream configurations are found in metadata

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

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

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

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

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {

                    targetCfg.width = ptr->width;

                    targetCfg.width = ptr->width;

                    targetCfg.height = ptr->height;

                    targetCfg.height = ptr->height;

                    targetCfg.format = static_cast<PixelFormat>(ptr->format);

                    targetCfg.format = static_cast<PixelFormat>(ptr->format);
@@ -1732,11 +1731,11 @@ TEST_P(EvsAidlTest, CameraUseStreamConfigToDisplay) { 
            // Stream configurations are found in metadata

            // Stream configurations are found in metadata

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

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

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

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

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {

                    if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {

                    if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {

                        targetCfg.width = ptr->width;

                        targetCfg.width = ptr->width;

                        targetCfg.height = ptr->height;

                        targetCfg.height = ptr->height;

                        targetCfg.format = static_cast<PixelFormat>(ptr->format);





                        maxArea = ptr->width * ptr->height;

                        maxArea = ptr->width * ptr->height;

                        foundCfg = true;

                        foundCfg = true;
@@ -1745,7 +1744,6 @@ TEST_P(EvsAidlTest, CameraUseStreamConfigToDisplay) { 
                ++ptr;

                ++ptr;

            }

            }

        }

        }

        targetCfg.format = static_cast<PixelFormat>(HAL_PIXEL_FORMAT_RGBA_8888);





        if (!foundCfg) {

        if (!foundCfg) {

            // Current EVS camera does not provide stream configurations in the

            // Current EVS camera does not provide stream configurations in the
@@ -1829,11 +1827,11 @@ TEST_P(EvsAidlTest, MultiCameraStreamUseConfig) { 
            // Stream configurations are found in metadata

            // Stream configurations are found in metadata

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

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

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

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

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT &&

                if (ptr->direction == ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) {

                    ptr->format == HAL_PIXEL_FORMAT_RGBA_8888) {

                    if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {

                    if (ptr->width * ptr->height > maxArea && ptr->framerate >= minReqFps) {

                        targetCfg.width = ptr->width;

                        targetCfg.width = ptr->width;

                        targetCfg.height = ptr->height;

                        targetCfg.height = ptr->height;

                        targetCfg.format = static_cast<PixelFormat>(ptr->format);





                        maxArea = ptr->width * ptr->height;

                        maxArea = ptr->width * ptr->height;

                        foundCfg = true;

                        foundCfg = true;
@@ -1842,7 +1840,6 @@ TEST_P(EvsAidlTest, MultiCameraStreamUseConfig) { 
                ++ptr;

                ++ptr;

            }

            }

        }

        }

        targetCfg.format = static_cast<PixelFormat>(HAL_PIXEL_FORMAT_RGBA_8888);





        if (!foundCfg) {

        if (!foundCfg) {

            LOG(INFO) << "Device " << cam.id

            LOG(INFO) << "Device " << cam.id