From patchwork Wed Mar 24 07:07:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 11681 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D38E0C32E7 for ; Wed, 24 Mar 2021 07:08:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8A2CC68D6C; Wed, 24 Mar 2021 08:08:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ECa0aZN9"; dkim-atps=neutral Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B028568D6E for ; Wed, 24 Mar 2021 08:08:19 +0100 (CET) Received: by mail-pg1-x52c.google.com with SMTP id v186so14007414pgv.7 for ; Wed, 24 Mar 2021 00:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DhOuHdYVQ11P/k0rjoAnrIunZytTz8xbjyDa2WLJKeM=; b=ECa0aZN9HpOxVTDwc2WrfdpbUatj3c46u15U3ZbUAuPVvuq+ZlQd+jKzTcEaf7cWaw VlY55mvSPkhwjr5PVh9Sgqt62s0Tz+sLXIZfbVmudQ1tPYLVm59q25NqcNn8MKqp/+ZP qjoyzZwy+so3ylRLpMGZsO3fI9Y6QTRDi7UQY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DhOuHdYVQ11P/k0rjoAnrIunZytTz8xbjyDa2WLJKeM=; b=hvsrvou2wheDdgrD5yRlzR1miilb+2ftS+io2JA0rVD9Y2LNFKsXkEkZTTIKGECrb4 XsRl315r7y/PUqvpf5fydbzKjBhqnlP1ZWLfz3fJgPaiPthtBYm7hDWEYfxiBZmPoThp jKJ5aSmupNh4SDwHtCXeXwoIeO4nUqK2juybHch5AS9hn0hWdlFHaqJut0BC3mTDqS4B 6Xj2LCMPrEPqD6PAuU3kfUOFQLbEgFProa5ZREqEef/jJjV6Gdr+qXZDfV3hFsLkWKLb JvtZV9V+BGCUZW814tUzJeqG4gDVY3f3FXvi/kZ9T70cFlMqmkQQoXF32sW7RapxfJtp 7hNw== X-Gm-Message-State: AOAM530dQEDcPERhPb+PXTHzDUExtMUGppa5S7C6v0jYVcMpyYPi0cBQ C1NYPnpZ3hScZ5/jBHDkEns2lPWroe4lnA== X-Google-Smtp-Source: ABdhPJwm+jpDS4pj3Hccnxt8cesrC6lGk2GPnvv4966XyJDBSlVroCElure8s424NVsrZE9s9bCUqg== X-Received: by 2002:a63:d7:: with SMTP id 206mr1879669pga.30.1616569694196; Wed, 24 Mar 2021 00:08:14 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:2:7c07:24cd:c637:7fab]) by smtp.gmail.com with ESMTPSA id e63sm1246860pfe.208.2021.03.24.00.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 00:08:13 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 24 Mar 2021 16:07:55 +0900 Message-Id: <20210324070757.3530377-7-hiroh@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210324070757.3530377-1-hiroh@chromium.org> References: <20210324070757.3530377-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 6/8] android: Camera3RequestDescriptor: Manage buffers with std::vector X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 47 ++++++++++++++++------------------- src/android/camera_device.h | 3 +-- 2 files changed, 22 insertions(+), 28 deletions(-) -- 2.31.0.291.g576ba9dcdaf-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index c0630e53..e75fd25f 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -271,16 +271,16 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor( frameNumber_ = camera3Request->frame_number; /* Copy the camera3 request stream information for later access. */ - numBuffers_ = camera3Request->num_output_buffers; - buffers_ = new camera3_stream_buffer_t[numBuffers_]; - for (unsigned int i = 0; i < numBuffers_; ++i) + const uint32_t numBuffers = camera3Request->num_output_buffers; + buffers_.resize(numBuffers); + for (uint32_t i = 0; i < numBuffers; i++) buffers_[i] = camera3Request->output_buffers[i]; /* * FrameBuffer instances created by wrapping a camera3 provided dmabuf * 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. */ settings_ = CameraMetadata(camera3Request->settings); @@ -294,10 +294,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor( reinterpret_cast(this)); } -CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() -{ - delete[] buffers_; -} +CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() = default; /* * \class CameraDevice @@ -1840,10 +1837,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques descriptor->settings_ = lastSettings_; LOG(HAL, Debug) << "Queueing request " << descriptor->request_->cookie() - << " with " << descriptor->numBuffers_ << " streams"; - for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { - const camera3_stream_buffer_t *camera3Buffer = &descriptor->buffers_[i]; - camera3_stream *camera3Stream = camera3Buffer->stream; + << " with " << descriptor->buffers_.size() << " streams"; + for (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) { + const camera3_stream_buffer_t &camera3Buffer = descriptor->buffers_[i]; + camera3_stream *camera3Stream = camera3Buffer.stream; CameraStream *cameraStream = static_cast(camera3Stream->priv); std::stringstream ss; @@ -1874,7 +1871,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques * associate it with the Camera3RequestDescriptor for * lifetime management only. */ - buffer = createFrameBuffer(*camera3Buffer->buffer); + buffer = createFrameBuffer(*camera3Buffer.buffer); descriptor->frameBuffers_.emplace_back(buffer); LOG(HAL, Debug) << ss.str() << " (direct)"; break; @@ -1899,7 +1896,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques } 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 " - << descriptor->numBuffers_ << " streams"; + << descriptor->buffers_.size() << " streams"; /* * \todo The timestamp used for the metadata is currently always taken @@ -1942,9 +1939,9 @@ void CameraDevice::requestComplete(Request *request) resultMetadata = getResultMetadata(descriptor, timestamp); /* Handle any JPEG compression. */ - for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { + for (camera3_stream_buffer_t &buffer : descriptor->buffers_) { CameraStream *cameraStream = - static_cast(descriptor->buffers_[i].stream->priv); + static_cast(buffer.stream->priv); if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB) continue; @@ -1956,7 +1953,7 @@ void CameraDevice::requestComplete(Request *request) } int ret = cameraStream->process(*src, - *descriptor->buffers_[i].buffer, + *buffer.buffer, descriptor->settings_, resultMetadata.get()); if (ret) { @@ -1975,15 +1972,13 @@ void CameraDevice::requestComplete(Request *request) /* Prepare to call back the Android camera stack. */ camera3_capture_result_t captureResult = {}; captureResult.frame_number = descriptor->frameNumber_; - captureResult.num_output_buffers = descriptor->numBuffers_; - for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { - descriptor->buffers_[i].acquire_fence = -1; - descriptor->buffers_[i].release_fence = -1; - descriptor->buffers_[i].status = status; + captureResult.num_output_buffers = descriptor->buffers_.size(); + for (camera3_stream_buffer_t &buffer : descriptor->buffers_) { + buffer.acquire_fence = -1; + buffer.release_fence = -1; + buffer.status = status; } - captureResult.output_buffers = - const_cast(descriptor->buffers_); - + captureResult.output_buffers = descriptor->buffers_.data(); if (status == CAMERA3_BUFFER_STATUS_OK) { notifyShutter(descriptor->frameNumber_, timestamp); diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 14e26b4d..a11cf243 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -74,8 +74,7 @@ private: ~Camera3RequestDescriptor(); uint32_t frameNumber_; - uint32_t numBuffers_; - camera3_stream_buffer_t *buffers_; + std::vector buffers_; std::vector> frameBuffers_; CameraMetadata settings_; std::unique_ptr request_;