Merge "Camera: fix acquire fence FD double close" into qt-dev (d68496de) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.cpp

+61 −23

Original line number	Diff line number	Diff line
		@@ -4401,11 +4401,12 @@ status_t Camera3Device::HalInterface::configureStreams(const camera_metadata_t *

		status_t Camera3Device::HalInterface::wrapAsHidlRequest(camera3_capture_request_t* request,
		/out/device::V3_2::CaptureRequest* captureRequest,
		/out/std::vector<native_handle_t> handlesCreated) {
		/out/std::vector<native_handle_t> handlesCreated,
		/out/std::vector<std::pair<int32_t, int32_t>>* inflightBuffers) {
		ATRACE_CALL();
		if (captureRequest == nullptr \|\| handlesCreated == nullptr) {
		ALOGE("%s: captureRequest (%p) and handlesCreated (%p) must not be null",
		__FUNCTION__, captureRequest, handlesCreated);
		if (captureRequest == nullptr \|\| handlesCreated == nullptr \|\| inflightBuffers == nullptr) {
		ALOGE("%s: captureRequest (%p), handlesCreated (%p), and inflightBuffers(%p) "
		"must not be null", __FUNCTION__, captureRequest, handlesCreated, inflightBuffers);
		return BAD_VALUE;
		}

		@@ -4435,8 +4436,8 @@ status_t Camera3Device::HalInterface::wrapAsHidlRequest(camera3_capture_request_
		captureRequest->inputBuffer.releaseFence = nullptr;

		pushInflightBufferLocked(captureRequest->frameNumber, streamId,
		request->input_buffer->buffer,
		request->input_buffer->acquire_fence);
		request->input_buffer->buffer);
		inflightBuffers->push_back(std::make_pair(captureRequest->frameNumber, streamId));
		} else {
		captureRequest->inputBuffer.streamId = -1;
		captureRequest->inputBuffer.bufferId = BUFFER_ID_NO_BUFFER;
		@@ -4475,14 +4476,31 @@ status_t Camera3Device::HalInterface::wrapAsHidlRequest(camera3_capture_request_

		// Output buffers are empty when using HAL buffer manager
		if (!mUseHalBufManager) {
		pushInflightBufferLocked(captureRequest->frameNumber, streamId,
		src->buffer, src->acquire_fence);
		pushInflightBufferLocked(captureRequest->frameNumber, streamId, src->buffer);
		inflightBuffers->push_back(std::make_pair(captureRequest->frameNumber, streamId));
		}
		}
		}
		return OK;
		}

		void Camera3Device::HalInterface::cleanupNativeHandles(
		std::vector<native_handle_t> handles, bool closeFd) {
		if (handles == nullptr) {
		return;
		}
		if (closeFd) {
		for (auto& handle : *handles) {
		native_handle_close(handle);
		}
		}
		for (auto& handle : *handles) {
		native_handle_delete(handle);
		}
		handles->clear();
		return;
		}

		status_t Camera3Device::HalInterface::processBatchCaptureRequests(
		std::vector<camera3_capture_request_t>& requests,/out/uint32_t numRequestProcessed) {
		ATRACE_NAME("CameraHal::processBatchCaptureRequests");
		@@ -4503,17 +4521,20 @@ status_t Camera3Device::HalInterface::processBatchCaptureRequests(
		captureRequests.resize(batchSize);
		}
		std::vector<native_handle_t*> handlesCreated;
		std::vector<std::pair<int32_t, int32_t>> inflightBuffers;

		status_t res = OK;
		for (size_t i = 0; i < batchSize; i++) {
		if (hidlSession_3_4 != nullptr) {
		res = wrapAsHidlRequest(requests[i], /out/&captureRequests_3_4[i].v3_2,
		/out/&handlesCreated);
		/out/&handlesCreated, /out/&inflightBuffers);
		} else {
		res = wrapAsHidlRequest(requests[i],
		/out/&captureRequests[i], /out/&handlesCreated);
		res = wrapAsHidlRequest(requests[i], /out/&captureRequests[i],
		/out/&handlesCreated, /out/&inflightBuffers);
		}
		if (res != OK) {
		popInflightBuffers(inflightBuffers);
		cleanupNativeHandles(&handlesCreated);
		return res;
		}
		}
		@@ -4610,18 +4631,30 @@ status_t Camera3Device::HalInterface::processBatchCaptureRequests(
		}
		if (!err.isOk()) {
		ALOGE("%s: Transaction error: %s", __FUNCTION__, err.description().c_str());
		return DEAD_OBJECT;
		status = common::V1_0::Status::CAMERA_DISCONNECTED;
		}

		if (status == common::V1_0::Status::OK && *numRequestProcessed != batchSize) {
		ALOGE("%s: processCaptureRequest returns OK but processed %d/%zu requests",
		__FUNCTION__, *numRequestProcessed, batchSize);
		status = common::V1_0::Status::INTERNAL_ERROR;
		}

		for (auto& handle : handlesCreated) {
		native_handle_delete(handle);
		res = CameraProviderManager::mapToStatusT(status);
		if (res == OK) {
		if (mHidlSession->isRemote()) {
		// Only close acquire fence FDs when the HIDL transaction succeeds (so the FDs have been
		// sent to camera HAL processes)
		cleanupNativeHandles(&handlesCreated, /closeFd/true);
		} else {
		// In passthrough mode the FDs are now owned by HAL
		cleanupNativeHandles(&handlesCreated);
		}
		return CameraProviderManager::mapToStatusT(status);
		} else {
		popInflightBuffers(inflightBuffers);
		cleanupNativeHandles(&handlesCreated);
		}
		return res;
		}

		status_t Camera3Device::HalInterface::flush() {
		@@ -4703,10 +4736,9 @@ void Camera3Device::HalInterface::getInflightRequestBufferKeys(
		}

		status_t Camera3Device::HalInterface::pushInflightBufferLocked(
		int32_t frameNumber, int32_t streamId, buffer_handle_t *buffer, int acquireFence) {
		int32_t frameNumber, int32_t streamId, buffer_handle_t *buffer) {
		uint64_t key = static_cast<uint64_t>(frameNumber) << 32 \| static_cast<uint64_t>(streamId);
		auto pair = std::make_pair(buffer, acquireFence);
		mInflightBufferMap[key] = pair;
		mInflightBufferMap[key] = buffer;
		return OK;
		}

		@@ -4718,16 +4750,22 @@ status_t Camera3Device::HalInterface::popInflightBuffer(
		uint64_t key = static_cast<uint64_t>(frameNumber) << 32 \| static_cast<uint64_t>(streamId);
		auto it = mInflightBufferMap.find(key);
		if (it == mInflightBufferMap.end()) return NAME_NOT_FOUND;
		auto pair = it->second;
		*buffer = pair.first;
		int acquireFence = pair.second;
		if (acquireFence > 0) {
		::close(acquireFence);
		if (buffer != nullptr) {
		*buffer = it->second;
		}
		mInflightBufferMap.erase(it);
		return OK;
		}

		void Camera3Device::HalInterface::popInflightBuffers(
		const std::vector<std::pair<int32_t, int32_t>>& buffers) {
		for (const auto& pair : buffers) {
		int32_t frameNumber = pair.first;
		int32_t streamId = pair.second;
		popInflightBuffer(frameNumber, streamId, nullptr);
		}
		}

		status_t Camera3Device::HalInterface::pushInflightRequestBuffer(
		uint64_t bufferId, buffer_handle_t* buf, int32_t streamId) {
		std::lock_guard<std::mutex> lock(mRequestedBuffersLock);

services/camera/libcameraservice/device3/Camera3Device.h

+12 −4

Original line number	Diff line number	Diff line
		@@ -358,13 +358,21 @@ class Camera3Device :
		// Do not free input camera3_capture_request_t before output HIDL request
		status_t wrapAsHidlRequest(camera3_capture_request_t* in,
		/out/hardware::camera::device::V3_2::CaptureRequest* out,
		/out/std::vector<native_handle_t> handlesCreated);
		/out/std::vector<native_handle_t> handlesCreated,
		/out/std::vector<std::pair<int32_t, int32_t>>* inflightBuffers);

		status_t pushInflightBufferLocked(int32_t frameNumber, int32_t streamId,
		buffer_handle_t *buffer, int acquireFence);
		buffer_handle_t *buffer);

		// Pop inflight buffers based on pairs of (frameNumber,streamId)
		void popInflightBuffers(const std::vector<std::pair<int32_t, int32_t>>& buffers);

		// Cache of buffer handles keyed off (frameNumber << 32 \| streamId)
		// value is a pair of (buffer_handle_t*, acquire_fence FD)
		std::unordered_map<uint64_t, std::pair<buffer_handle_t*, int>> mInflightBufferMap;
		std::unordered_map<uint64_t, buffer_handle_t*> mInflightBufferMap;

		// Delete and optionally close native handles and clear the input vector afterward
		static void cleanupNativeHandles(
		std::vector<native_handle_t> handles, bool closeFd = false);

		struct BufferHasher {
		size_t operator()(const buffer_handle_t& buf) const {