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

Camera: VTS: Fix fence fd double close am: 3ad137edbb am: 053503888b

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

Change-Id: I137949037570e9359c18bd1390d85a4e3f7e5e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shuzhen Wang 2023-04-18 01:47:23 +00:00 committed by Automerger Merge Worker
commit bc79bccb87
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
camera/provider/aidl/vts/camera_aidl_test.cpp
View file

@ -148,7 +148,7 @@ void CameraAidlTest::waitForReleaseFence(
const native_handle_t* releaseFenceHandle = bufferAndTimestamp.buffer.releaseFence; const native_handle_t* releaseFenceHandle = bufferAndTimestamp.buffer.releaseFence;
if (releaseFenceHandle != nullptr && releaseFenceHandle->numFds == 1 && if (releaseFenceHandle != nullptr && releaseFenceHandle->numFds == 1 &&
releaseFenceHandle->data[0] >= 0) { releaseFenceHandle->data[0] >= 0) {
releaseFence = new android::Fence(releaseFenceHandle->data[0]); releaseFence = new android::Fence(dup(releaseFenceHandle->data[0]));
} }
if (releaseFence && releaseFence->isValid()) { if (releaseFence && releaseFence->isValid()) {
releaseFence->wait(/*ms*/ 300); releaseFence->wait(/*ms*/ 300);

14
camera/provider/aidl/vts/camera_aidl_test.h
View file

@ -478,6 +478,20 @@ class CameraAidlTest : public ::testing::TestWithParam<std::string> {
hasInputBuffer(hasInput), hasInputBuffer(hasInput),
collectedResult(1, 10), collectedResult(1, 10),
expectedPhysicalResults(extraPhysicalResult) {} expectedPhysicalResults(extraPhysicalResult) {}
~InFlightRequest() {
for (auto& buffer : resultOutputBuffers) {
native_handle_t* acquireFenceHandle = const_cast<native_handle_t*>(
buffer.buffer.acquireFence);
native_handle_close(acquireFenceHandle);
native_handle_delete(acquireFenceHandle);
native_handle_t* releaseFenceHandle = const_cast<native_handle_t*>(
buffer.buffer.releaseFence);
native_handle_close(releaseFenceHandle);
native_handle_delete(releaseFenceHandle);
}
}
}; };
static bool matchDeviceName(const std::string& deviceName, const std::string& providerType, static bool matchDeviceName(const std::string& deviceName, const std::string& providerType,

4
camera/provider/aidl/vts/device_cb.cpp
View file

@ -428,8 +428,8 @@ bool DeviceCb::processCaptureResultLocked(
bufferId, bufferId,
outputBuffer, outputBuffer,
buffer.status, buffer.status,
::android::makeFromAidl(buffer.acquireFence), ::android::dupFromAidl(buffer.acquireFence),
::android::makeFromAidl(buffer.releaseFence)}; ::android::dupFromAidl(buffer.releaseFence)};
streamBufferAndTimestamp.timeStamp = systemTime(); streamBufferAndTimestamp.timeStamp = systemTime();
request->resultOutputBuffers.push_back(streamBufferAndTimestamp); request->resultOutputBuffers.push_back(streamBufferAndTimestamp);
} }