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

Merge "Handle logical camera devices properly" into main am: 20768c89d7 am: b034621d77 am: bec8691480

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

Change-Id: I861caede7c9972bd7b41955628faf584fbe880b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-10 00:13:27 +00:00
committed by Automerger Merge Worker
parent 5b7f3e3530 bec8691480
commit c4e4426574
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp
View File

@@ -1399,6 +1399,12 @@ TEST_P(EvsAidlTest, HighPriorityCameraClient) {
// Test each reported camera
for (auto&& cam : mCameraInfo) {
bool isLogicalCam = false;
if (getPhysicalCameraIds(cam.id, isLogicalCam); isLogicalCam) {
LOG(INFO) << "Skip a logical device, " << cam.id;
continue;
}
// Request available display IDs
uint8_t targetDisplayId = 0;
std::vector<uint8_t> displayIds;
@@ -1973,6 +1979,13 @@ TEST_P(EvsAidlTest, CameraStreamExternalBuffering) {
// Test each reported camera
for (auto&& cam : mCameraInfo) {
bool isLogicalCam = false;
getPhysicalCameraIds(cam.id, isLogicalCam);
if (isLogicalCam) {
LOG(INFO) << "Skip a logical device, " << cam.id;
continue;
}
// Read a target resolution from the metadata
Stream targetCfg = getFirstStreamConfiguration(
reinterpret_cast<camera_metadata_t*>(cam.metadata.data()));
@@ -2014,9 +2027,6 @@ TEST_P(EvsAidlTest, CameraStreamExternalBuffering) {
}
}
bool isLogicalCam = false;
getPhysicalCameraIds(cam.id, isLogicalCam);
std::shared_ptr<IEvsCamera> pCam;
ASSERT_TRUE(mEnumerator->openCamera(cam.id, targetCfg, &pCam).isOk());
EXPECT_NE(pCam, nullptr);
@@ -2027,11 +2037,6 @@ TEST_P(EvsAidlTest, CameraStreamExternalBuffering) {
// Request to import buffers
int delta = 0;
auto status = pCam->importExternalBuffers(buffers, &delta);
if (isLogicalCam) {
ASSERT_FALSE(status.isOk());
continue;
}
ASSERT_TRUE(status.isOk());
EXPECT_GE(delta, kBuffersToHold);