Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Camera: Set arbitrary dataspace for RAW streams

Browse Source 
Use 'arbitrary' dataspace when trying to configure RAW streams.

Bug: 179158925
Test: pass vts with VtsHalCameraProviderV2_4TargetTest
Change-Id: I6360e4a459ae51af4898a7329fe31ded152efe8f
This commit is contained in:
Pierce Huang
2021-02-04 11:41:48 +08:00
parent 92d4d99b98
commit b2bb987951
1 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View File

@@ -888,6 +888,8 @@ public:
static Status getSystemCameraKind(const camera_metadata_t* staticMeta,
SystemCameraKind* systemCameraKind);
static V3_2::DataspaceFlags getDataspace(PixelFormat format);
void processCaptureRequestInternal(uint64_t bufferusage, RequestTemplate reqTemplate,
bool useSecureOnlyCameras);
@@ -3173,7 +3175,6 @@ TEST_P(CameraHidlTest, constructDefaultRequestSettings) {
}
}
// Verify that all supported stream formats and sizes can be configured
// successfully.
TEST_P(CameraHidlTest, configureStreamsAvailableOutputs) {
@@ -3216,17 +3217,7 @@ TEST_P(CameraHidlTest, configureStreamsAvailableOutputs) {
uint32_t streamConfigCounter = 0;
for (auto& it : outputStreams) {
V3_2::Stream stream3_2;
V3_2::DataspaceFlags dataspaceFlag = 0;
switch (static_cast<PixelFormat>(it.format)) {
case PixelFormat::BLOB:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF);
break;
case PixelFormat::Y16:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
break;
default:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
}
V3_2::DataspaceFlags dataspaceFlag = getDataspace(static_cast<PixelFormat>(it.format));
stream3_2 = {streamId,
StreamType::OUTPUT,
static_cast<uint32_t>(it.width),
@@ -3346,17 +3337,8 @@ TEST_P(CameraHidlTest, configureConcurrentStreamsAvailableOutputs) {
size_t j = 0;
for (const auto& it : outputStreams) {
V3_2::Stream stream3_2;
V3_2::DataspaceFlags dataspaceFlag = 0;
switch (static_cast<PixelFormat>(it.format)) {
case PixelFormat::BLOB:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF);
break;
case PixelFormat::Y16:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
break;
default:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
}
V3_2::DataspaceFlags dataspaceFlag =
getDataspace(static_cast<PixelFormat>(it.format));
stream3_2 = {streamId++,
StreamType::OUTPUT,
static_cast<uint32_t>(it.width),
@@ -5896,6 +5878,23 @@ Status CameraHidlTest::getSystemCameraKind(const camera_metadata_t* staticMeta,
return ret;
}
// Select an appropriate dataspace given a specific pixel format.
V3_2::DataspaceFlags CameraHidlTest::getDataspace(PixelFormat format) {
switch (format) {
case PixelFormat::BLOB:
return static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF);
case PixelFormat::Y16:
return static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
case PixelFormat::RAW16:
case PixelFormat::RAW_OPAQUE:
case PixelFormat::RAW10:
case PixelFormat::RAW12:
return static_cast<V3_2::DataspaceFlags>(Dataspace::ARBITRARY);
default:
return static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
}
}
// Check whether this is a monochrome camera using the static camera characteristics.
Status CameraHidlTest::isMonochromeCamera(const camera_metadata_t *staticMeta) {
Status ret = Status::METHOD_NOT_SUPPORTED;
@@ -6270,17 +6269,8 @@ void CameraHidlTest::configureOfflineStillStream(const std::string &name,
ASSERT_EQ(Status::OK, rc);
ASSERT_FALSE(outputStreams.empty());
V3_2::DataspaceFlags dataspaceFlag = 0;
switch (static_cast<PixelFormat>(outputStreams[idx].format)) {
case PixelFormat::BLOB:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::V0_JFIF);
break;
case PixelFormat::Y16:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::DEPTH);
break;
default:
dataspaceFlag = static_cast<V3_2::DataspaceFlags>(Dataspace::UNKNOWN);
}
V3_2::DataspaceFlags dataspaceFlag =
getDataspace(static_cast<PixelFormat>(outputStreams[idx].format));
::android::hardware::hidl_vec<V3_4::Stream> streams3_4(/*size*/1);
V3_4::Stream stream3_4 = {{ 0 /*streamId*/, StreamType::OUTPUT,