tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Camera: Update stream consumer usage flag" into oc-mr1-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-07-31 07:55:04 +00:00 committed by Android (Google) Code Review
commit 8258ffc506
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View file

@ -2213,7 +2213,7 @@ TEST_F(CameraHidlTest, configureStreamsAvailableOutputs) {
static_cast<uint32_t>(it.width), static_cast<uint32_t>(it.width),
static_cast<uint32_t>(it.height), static_cast<uint32_t>(it.height),
static_cast<PixelFormat>(it.format), static_cast<PixelFormat>(it.format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {stream}; ::android::hardware::hidl_vec<Stream> streams = {stream};
@ -2257,7 +2257,7 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) {
static_cast<uint32_t>(0), static_cast<uint32_t>(0),
static_cast<uint32_t>(0), static_cast<uint32_t>(0),
static_cast<PixelFormat>(outputStreams[0].format), static_cast<PixelFormat>(outputStreams[0].format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {stream}; ::android::hardware::hidl_vec<Stream> streams = {stream};
@ -2272,7 +2272,7 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) {
static_cast<uint32_t>(UINT32_MAX), static_cast<uint32_t>(UINT32_MAX),
static_cast<uint32_t>(UINT32_MAX), static_cast<uint32_t>(UINT32_MAX),
static_cast<PixelFormat>(outputStreams[0].format), static_cast<PixelFormat>(outputStreams[0].format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
streams[0] = stream; streams[0] = stream;
@ -2288,7 +2288,7 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) {
static_cast<uint32_t>(it.width), static_cast<uint32_t>(it.width),
static_cast<uint32_t>(it.height), static_cast<uint32_t>(it.height),
static_cast<PixelFormat>(UINT32_MAX), static_cast<PixelFormat>(UINT32_MAX),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
streams[0] = stream; streams[0] = stream;
@ -2303,7 +2303,7 @@ TEST_F(CameraHidlTest, configureStreamsInvalidOutputs) {
static_cast<uint32_t>(it.width), static_cast<uint32_t>(it.width),
static_cast<uint32_t>(it.height), static_cast<uint32_t>(it.height),
static_cast<PixelFormat>(it.format), static_cast<PixelFormat>(it.format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
static_cast<StreamRotation>(UINT32_MAX)}; static_cast<StreamRotation>(UINT32_MAX)};
streams[0] = stream; streams[0] = stream;
@ -2383,7 +2383,7 @@ TEST_F(CameraHidlTest, configureStreamsZSLInputOutputs) {
static_cast<uint32_t>(outputIter.width), static_cast<uint32_t>(outputIter.width),
static_cast<uint32_t>(outputIter.height), static_cast<uint32_t>(outputIter.height),
static_cast<PixelFormat>(outputIter.format), static_cast<PixelFormat>(outputIter.format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
@ -2441,7 +2441,7 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) {
static_cast<uint32_t>(previewIter.width), static_cast<uint32_t>(previewIter.width),
static_cast<uint32_t>(previewIter.height), static_cast<uint32_t>(previewIter.height),
static_cast<PixelFormat>(previewIter.format), static_cast<PixelFormat>(previewIter.format),
0, GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
Stream blobStream = {streamId++, Stream blobStream = {streamId++,
@ -2449,7 +2449,7 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) {
static_cast<uint32_t>(blobIter.width), static_cast<uint32_t>(blobIter.width),
static_cast<uint32_t>(blobIter.height), static_cast<uint32_t>(blobIter.height),
static_cast<PixelFormat>(blobIter.format), static_cast<PixelFormat>(blobIter.format),
0, GRALLOC1_CONSUMER_USAGE_CPU_READ,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {previewStream, blobStream}; ::android::hardware::hidl_vec<Stream> streams = {previewStream, blobStream};
@ -2501,7 +2501,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
static_cast<uint32_t>(hfrStream.width), static_cast<uint32_t>(hfrStream.width),
static_cast<uint32_t>(hfrStream.height), static_cast<uint32_t>(hfrStream.height),
static_cast<PixelFormat>(hfrStream.format), static_cast<PixelFormat>(hfrStream.format),
0, GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {stream}; ::android::hardware::hidl_vec<Stream> streams = {stream};
@ -2520,7 +2520,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
static_cast<uint32_t>(0), static_cast<uint32_t>(0),
static_cast<uint32_t>(0), static_cast<uint32_t>(0),
static_cast<PixelFormat>(hfrStream.format), static_cast<PixelFormat>(hfrStream.format),
0, GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
streams[0] = stream; streams[0] = stream;
@ -2535,7 +2535,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
static_cast<uint32_t>(UINT32_MAX), static_cast<uint32_t>(UINT32_MAX),
static_cast<uint32_t>(UINT32_MAX), static_cast<uint32_t>(UINT32_MAX),
static_cast<PixelFormat>(hfrStream.format), static_cast<PixelFormat>(hfrStream.format),
0, GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
streams[0] = stream; streams[0] = stream;
@ -2550,7 +2550,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
static_cast<uint32_t>(hfrStream.width), static_cast<uint32_t>(hfrStream.width),
static_cast<uint32_t>(hfrStream.height), static_cast<uint32_t>(hfrStream.height),
static_cast<PixelFormat>(UINT32_MAX), static_cast<PixelFormat>(UINT32_MAX),
0, GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
streams[0] = stream; streams[0] = stream;
@ -2603,7 +2603,7 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) {
static_cast<uint32_t>(videoIter.width), static_cast<uint32_t>(videoIter.width),
static_cast<uint32_t>(videoIter.height), static_cast<uint32_t>(videoIter.height),
static_cast<PixelFormat>(videoIter.format), static_cast<PixelFormat>(videoIter.format),
0, GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
Stream blobStream = {streamId++, Stream blobStream = {streamId++,
@ -2611,7 +2611,7 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) {
static_cast<uint32_t>(blobIter.width), static_cast<uint32_t>(blobIter.width),
static_cast<uint32_t>(blobIter.height), static_cast<uint32_t>(blobIter.height),
static_cast<PixelFormat>(blobIter.format), static_cast<PixelFormat>(blobIter.format),
GRALLOC_USAGE_HW_VIDEO_ENCODER, GRALLOC1_CONSUMER_USAGE_CPU_READ,
0, 0,
StreamRotation::ROTATION_0}; StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {videoStream, blobStream}; ::android::hardware::hidl_vec<Stream> streams = {videoStream, blobStream};
@ -3291,7 +3291,7 @@ void CameraHidlTest::configurePreviewStream(const std::string &name,
static_cast<uint32_t> (outputPreviewStreams[0].width), static_cast<uint32_t> (outputPreviewStreams[0].width),
static_cast<uint32_t> (outputPreviewStreams[0].height), static_cast<uint32_t> (outputPreviewStreams[0].height),
static_cast<PixelFormat> (outputPreviewStreams[0].format), static_cast<PixelFormat> (outputPreviewStreams[0].format),
0, 0, StreamRotation::ROTATION_0}; GRALLOC1_CONSUMER_USAGE_HWCOMPOSER, 0, StreamRotation::ROTATION_0};
::android::hardware::hidl_vec<Stream> streams = {*previewStream}; ::android::hardware::hidl_vec<Stream> streams = {*previewStream};
StreamConfiguration config = {streams, StreamConfiguration config = {streams,
StreamConfigurationMode::NORMAL_MODE}; StreamConfigurationMode::NORMAL_MODE};