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

VTS: Verify no duplicate entries between partial results

Browse source 
Partial results are appended together. If there are duplicate entries
between partial results, there will be more than more entries for a tag
in the final result. This can cause undefined behavior, especially when
they have different values.

Test: Run Camera VTS test on Pixel devices
Bug: 170575182
Change-Id: I931660cef16a90ee0c247e3c4513a88adb7211ab
This commit is contained in:
Shuzhen Wang 2020-11-13 17:58:40 -08:00
parent 6b08578192
commit 6f906c15ab
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1260,9 +1260,27 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r
ADD_FAILURE();
return notify;
}
request->collectedResult.append(
reinterpret_cast<const camera_metadata_t*>(
resultMetadata.data()));
// Verify no duplicate tags between partial results
const camera_metadata_t* partialMetadata =
reinterpret_cast<const camera_metadata_t*>(resultMetadata.data());
const camera_metadata_t* collectedMetadata = request->collectedResult.getAndLock();
camera_metadata_ro_entry_t searchEntry, foundEntry;
for (size_t i = 0; i < get_camera_metadata_size(partialMetadata); i++) {
if (0 != get_camera_metadata_ro_entry(partialMetadata, i, &searchEntry)) {
ADD_FAILURE();
request->collectedResult.unlock(collectedMetadata);
return notify;
}
if (-ENOENT !=
find_camera_metadata_ro_entry(collectedMetadata, searchEntry.tag, &foundEntry)) {
ADD_FAILURE();
request->collectedResult.unlock(collectedMetadata);
return notify;
}
}
request->collectedResult.unlock(collectedMetadata);
request->collectedResult.append(partialMetadata);
isPartialResult =
(results.partialResult < request->numPartialResults);