Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: Camera3RequestDescriptor: Manage buffers with std::vector

Browse source 
Camera3RequestDescriptor has a length and an allocated buffer
for camera_stream_buffer_t array. This replaces the variables
with std::vector.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-03-24 16:07:55 +09:00 • committed by Laurent Pinchart
parent 14b262dacf
commit 17a6e78e00
2 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/android/camera_device.cpp
View file

@ -271,16 +271,16 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(
frameNumber_ = camera3Request->frame_number; frameNumber_ = camera3Request->frame_number;
/* Copy the camera3 request stream information for later access. */ /* Copy the camera3 request stream information for later access. */
numBuffers_ = camera3Request->num_output_buffers; const uint32_t numBuffers = camera3Request->num_output_buffers;
buffers_ = new camera3_stream_buffer_t[numBuffers_]; buffers_.resize(numBuffers);
for (unsigned int i = 0; i < numBuffers_; ++i) for (uint32_t i = 0; i < numBuffers; i++)
buffers_[i] = camera3Request->output_buffers[i]; buffers_[i] = camera3Request->output_buffers[i];
/* /*
* FrameBuffer instances created by wrapping a camera3 provided dmabuf * FrameBuffer instances created by wrapping a camera3 provided dmabuf
* are emplaced in this vector of unique_ptr<> for lifetime management. * are emplaced in this vector of unique_ptr<> for lifetime management.
*/ */
frameBuffers_.reserve(numBuffers_); frameBuffers_.reserve(numBuffers);
/* Clone the controls associated with the camera3 request. */ /* Clone the controls associated with the camera3 request. */
settings_ = CameraMetadata(camera3Request->settings); settings_ = CameraMetadata(camera3Request->settings);
@ -294,10 +294,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(
reinterpret_cast<uint64_t>(this)); reinterpret_cast<uint64_t>(this));
} }
CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;
{
delete[] buffers_;
}
/* /*
* \class CameraDevice * \class CameraDevice
@ -1840,10 +1837,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
descriptor->settings_ = lastSettings_; descriptor->settings_ = lastSettings_;
LOG(HAL, Debug) << "Queueing request " << descriptor->request_->cookie() LOG(HAL, Debug) << "Queueing request " << descriptor->request_->cookie()
<< " with " << descriptor->numBuffers_ << " streams"; << " with " << descriptor->buffers_.size() << " streams";
for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { for (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) {
const camera3_stream_buffer_t *camera3Buffer = &descriptor->buffers_[i]; const camera3_stream_buffer_t &camera3Buffer = descriptor->buffers_[i];
camera3_stream *camera3Stream = camera3Buffer->stream; camera3_stream *camera3Stream = camera3Buffer.stream;
CameraStream *cameraStream = static_cast<CameraStream *>(camera3Stream->priv); CameraStream *cameraStream = static_cast<CameraStream *>(camera3Stream->priv);
std::stringstream ss; std::stringstream ss;
@ -1874,7 +1871,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
* associate it with the Camera3RequestDescriptor for * associate it with the Camera3RequestDescriptor for
* lifetime management only. * lifetime management only.
*/ */
buffer = createFrameBuffer(*camera3Buffer->buffer); buffer = createFrameBuffer(*camera3Buffer.buffer);
descriptor->frameBuffers_.emplace_back(buffer); descriptor->frameBuffers_.emplace_back(buffer);
LOG(HAL, Debug) << ss.str() << " (direct)"; LOG(HAL, Debug) << ss.str() << " (direct)";
break; break;
@ -1899,7 +1896,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
} }
descriptor->request_->addBuffer(cameraStream->stream(), buffer, descriptor->request_->addBuffer(cameraStream->stream(), buffer,
camera3Buffer->acquire_fence); camera3Buffer.acquire_fence);
} }
/* /*
@ -1930,7 +1927,7 @@ void CameraDevice::requestComplete(Request *request)
} }
LOG(HAL, Debug) << "Request " << request->cookie() << " completed with " LOG(HAL, Debug) << "Request " << request->cookie() << " completed with "
<< descriptor->numBuffers_ << " streams"; << descriptor->buffers_.size() << " streams";
/* /*
* \todo The timestamp used for the metadata is currently always taken * \todo The timestamp used for the metadata is currently always taken
@ -1942,9 +1939,9 @@ void CameraDevice::requestComplete(Request *request)
resultMetadata = getResultMetadata(descriptor, timestamp); resultMetadata = getResultMetadata(descriptor, timestamp);
/* Handle any JPEG compression. */ /* Handle any JPEG compression. */
for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { for (camera3_stream_buffer_t &buffer : descriptor->buffers_) {
CameraStream *cameraStream = CameraStream *cameraStream =
static_cast<CameraStream *>(descriptor->buffers_[i].stream->priv); static_cast<CameraStream *>(buffer.stream->priv);
if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB) if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB)
continue; continue;
@ -1956,7 +1953,7 @@ void CameraDevice::requestComplete(Request *request)
} }
int ret = cameraStream->process(*src, int ret = cameraStream->process(*src,
*descriptor->buffers_[i].buffer, *buffer.buffer,
descriptor->settings_, descriptor->settings_,
resultMetadata.get()); resultMetadata.get());
if (ret) { if (ret) {
@ -1975,15 +1972,13 @@ void CameraDevice::requestComplete(Request *request)
/* Prepare to call back the Android camera stack. */ /* Prepare to call back the Android camera stack. */
camera3_capture_result_t captureResult = {}; camera3_capture_result_t captureResult = {};
captureResult.frame_number = descriptor->frameNumber_; captureResult.frame_number = descriptor->frameNumber_;
captureResult.num_output_buffers = descriptor->numBuffers_; captureResult.num_output_buffers = descriptor->buffers_.size();
for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { for (camera3_stream_buffer_t &buffer : descriptor->buffers_) {
descriptor->buffers_[i].acquire_fence = -1; buffer.acquire_fence = -1;
descriptor->buffers_[i].release_fence = -1; buffer.release_fence = -1;
descriptor->buffers_[i].status = status; buffer.status = status;
} }
captureResult.output_buffers = captureResult.output_buffers = descriptor->buffers_.data();
const_cast<const camera3_stream_buffer_t *>(descriptor->buffers_);
if (status == CAMERA3_BUFFER_STATUS_OK) { if (status == CAMERA3_BUFFER_STATUS_OK) {
notifyShutter(descriptor->frameNumber_, timestamp); notifyShutter(descriptor->frameNumber_, timestamp);

3
src/android/camera_device.h
View file

@ -74,8 +74,7 @@ private:
~Camera3RequestDescriptor(); ~Camera3RequestDescriptor();
uint32_t frameNumber_; uint32_t frameNumber_;
uint32_t numBuffers_; std::vector<camera3_stream_buffer_t> buffers_;
camera3_stream_buffer_t *buffers_;
std::vector<std::unique_ptr<libcamera::FrameBuffer>> frameBuffers_; std::vector<std::unique_ptr<libcamera::FrameBuffer>> frameBuffers_;
CameraMetadata settings_; CameraMetadata settings_;
std::unique_ptr<CaptureRequest> request_; std::unique_ptr<CaptureRequest> request_;