Loading camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +21 −3 Original line number Original line Diff line number Diff line Loading @@ -1265,9 +1265,27 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r ADD_FAILURE(); ADD_FAILURE(); return notify; return notify; } } request->collectedResult.append( reinterpret_cast<const camera_metadata_t*>( // Verify no duplicate tags between partial results resultMetadata.data())); 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 = isPartialResult = (results.partialResult < request->numPartialResults); (results.partialResult < request->numPartialResults); Loading Loading
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +21 −3 Original line number Original line Diff line number Diff line Loading @@ -1265,9 +1265,27 @@ bool CameraHidlTest::DeviceCb::processCaptureResultLocked(const CaptureResult& r ADD_FAILURE(); ADD_FAILURE(); return notify; return notify; } } request->collectedResult.append( reinterpret_cast<const camera_metadata_t*>( // Verify no duplicate tags between partial results resultMetadata.data())); 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 = isPartialResult = (results.partialResult < request->numPartialResults); (results.partialResult < request->numPartialResults); Loading