From d9a7d3cd95c2c7e0e88c370b16ba0b79423a07b2 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Wed, 26 Jul 2017 09:46:38 +0100 Subject: [PATCH] NO PARTIAL RERUN Camera: Update stream consumer usage flag It is possible that the current default consumer usage flag may not be supported by some provider implementations. Use either HW composer or some other flag that is appropriate for the specific use case. Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6 Bug: 63913159 Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --skip-preconditions --primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6 --- .../VtsHalCameraProviderV2_4TargetTest.cpp | 46 ++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 97e1b90ec1..b9a1e5f095 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -2441,7 +2441,8 @@ TEST_F(CameraHidlTest, configureStreamsAvailableOutputs) { Stream stream = {streamId, StreamType::OUTPUT, static_cast (it.width), static_cast (it.height), - static_cast (it.format), 0, 0, + static_cast (it.format), + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = {stream}; StreamConfiguration config = {streams, @@ -2490,7 +2491,8 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) { static_cast (0), static_cast (0), static_cast (outputStreams[0].format), - 0, 0, StreamRotation::ROTATION_0}; + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, + StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = {stream}; StreamConfiguration config = {streams, StreamConfigurationMode::NORMAL_MODE}; @@ -2505,7 +2507,8 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) { static_cast (UINT32_MAX), static_cast (UINT32_MAX), static_cast (outputStreams[0].format), - 0, 0, StreamRotation::ROTATION_0}; + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, + StreamRotation::ROTATION_0}; streams[0] = stream; config = {streams, StreamConfigurationMode::NORMAL_MODE}; @@ -2520,7 +2523,8 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) { static_cast (it.width), static_cast (it.height), static_cast (UINT32_MAX), - 0, 0, StreamRotation::ROTATION_0}; + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, + StreamRotation::ROTATION_0}; streams[0] = stream; config = {streams, StreamConfigurationMode::NORMAL_MODE}; @@ -2534,7 +2538,8 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) { static_cast (it.width), static_cast (it.height), static_cast (it.format), - 0, 0, static_cast (UINT32_MAX)}; + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, + static_cast (UINT32_MAX)}; streams[0] = stream; config = {streams, StreamConfigurationMode::NORMAL_MODE}; @@ -2611,12 +2616,14 @@ TEST_F(CameraHidlTest, configureStreamsZSLInputOutputs) { Stream inputStream = {streamId++, StreamType::INPUT, static_cast (input.width), static_cast (input.height), - static_cast (input.format), 0, 0, + static_cast (input.format), + 0, 0, StreamRotation::ROTATION_0}; Stream outputStream = {streamId++, StreamType::OUTPUT, static_cast (outputIter.width), static_cast (outputIter.height), - static_cast (outputIter.format), 0, 0, + static_cast (outputIter.format), + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = { @@ -2678,12 +2685,14 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) { Stream previewStream = {streamId++, StreamType::OUTPUT, static_cast (previewIter.width), static_cast (previewIter.height), - static_cast (previewIter.format), 0, 0, + static_cast (previewIter.format), + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0}; Stream blobStream = {streamId++, StreamType::OUTPUT, static_cast (blobIter.width), static_cast (blobIter.height), - static_cast (blobIter.format), 0, 0, + static_cast (blobIter.format), + GRALLOC1_CONSUMER_USAGE_CPU_READ, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = { previewStream, blobStream}; @@ -2739,7 +2748,8 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) { Stream stream = {streamId, StreamType::OUTPUT, static_cast (hfrStream.width), static_cast (hfrStream.height), - static_cast (hfrStream.format), 0, 0, + static_cast (hfrStream.format), + GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = {stream}; StreamConfiguration config = {streams, @@ -2755,7 +2765,8 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) { stream = {streamId++, StreamType::OUTPUT, static_cast (0), static_cast (0), - static_cast (hfrStream.format), 0, 0, + static_cast (hfrStream.format), + GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER, 0, StreamRotation::ROTATION_0}; streams[0] = stream; config = {streams, @@ -2770,7 +2781,8 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) { stream = {streamId++, StreamType::OUTPUT, static_cast (UINT32_MAX), static_cast (UINT32_MAX), - static_cast (hfrStream.format), 0, 0, + static_cast (hfrStream.format), + GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER, 0, StreamRotation::ROTATION_0}; streams[0] = stream; config = {streams, @@ -2784,7 +2796,8 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) { stream = {streamId++, StreamType::OUTPUT, static_cast (hfrStream.width), static_cast (hfrStream.height), - static_cast (UINT32_MAX), 0, 0, + static_cast (UINT32_MAX), + GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER, 0, StreamRotation::ROTATION_0}; streams[0] = stream; config = {streams, @@ -2842,12 +2855,13 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) { static_cast (videoIter.width), static_cast (videoIter.height), static_cast (videoIter.format), - 0, 0, StreamRotation::ROTATION_0}; + GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER, 0, + StreamRotation::ROTATION_0}; Stream blobStream = {streamId++, StreamType::OUTPUT, static_cast (blobIter.width), static_cast (blobIter.height), static_cast (blobIter.format), - GRALLOC_USAGE_HW_VIDEO_ENCODER, 0, + GRALLOC1_CONSUMER_USAGE_CPU_READ, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = { videoStream, blobStream}; @@ -3567,7 +3581,7 @@ void CameraHidlTest::configurePreviewStream(const std::string &name, static_cast (outputPreviewStreams[0].width), static_cast (outputPreviewStreams[0].height), static_cast (outputPreviewStreams[0].format), - 0, 0, StreamRotation::ROTATION_0}; + GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0}; ::android::hardware::hidl_vec streams = {*previewStream}; StreamConfiguration config = {streams, StreamConfigurationMode::NORMAL_MODE};