Patch Detail
Show a patch.
GET /api/patches/9804/?format=api
{ "id": 9804, "url": "https://patchwork.libcamera.org/api/patches/9804/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9804/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200925014207.1455796-7-niklas.soderlund@ragnatech.se>", "date": "2020-09-25T01:41:51", "name": "[libcamera-devel,v3,06/22] libcamera: pipeline: rkisp1: Create RkISP1Frames from camera data", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9d6022e08dc9d31ec7e671ae646ab66bdbc39140", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9804/mbox/", "series": [ { "id": 1325, "url": "https://patchwork.libcamera.org/api/series/1325/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1325", "date": "2020-09-25T01:41:45", "name": "libcamera: pipeline: rkisp1: Extend to support two streams", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1325/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9804/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9804/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 2FE1FC3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Sep 2020 01:42:51 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0927D6303F;\n\tFri, 25 Sep 2020 03:42:51 +0200 (CEST)", "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 406B762FD8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Sep 2020 03:42:46 +0200 (CEST)", "from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 686e9ef9-fed0-11ea-92dc-005056917a89;\n\tFri, 25 Sep 2020 03:42:45 +0200 (CEST)" ], "X-Halon-ID": "686e9ef9-fed0-11ea-92dc-005056917a89", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 25 Sep 2020 03:41:51 +0200", "Message-Id": "<20200925014207.1455796-7-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>", "References": "<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 06/22] libcamera: pipeline: rkisp1:\n\tCreate RkISP1Frames from camera data", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Create RkISP1Frames from camera data instead of picking information out\nfrom it. This is done to prepare for multi stream support where more\ninformation from the camera data will be needed.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n* Changes since v1\n- Grammar fixes in commit message.\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 13 +++++++------\n 1 file changed, 7 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex d6b5073b2084a9f4..e52aadcfdb9870a3 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -54,6 +54,7 @@ constexpr std::array<PixelFormat, 7> RKISP1_RSZ_MP_FORMATS{\n \n class PipelineHandlerRkISP1;\n class RkISP1ActionQueueBuffers;\n+class RkISP1CameraData;\n \n enum RkISP1ActionType {\n \tSetSensor,\n@@ -79,7 +80,7 @@ class RkISP1Frames\n public:\n \tRkISP1Frames(PipelineHandler *pipe);\n \n-\tRkISP1FrameInfo *create(unsigned int frame, Request *request, Stream *stream);\n+\tRkISP1FrameInfo *create(const RkISP1CameraData *data, Request *request);\n \tint destroy(unsigned int frame);\n \tvoid clear();\n \n@@ -244,8 +245,10 @@ RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n {\n }\n \n-RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stream *stream)\n+RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *request)\n {\n+\tunsigned int frame = data->frame_;\n+\n \tif (pipe_->availableParamBuffers_.empty()) {\n \t\tLOG(RkISP1, Error) << \"Parameters buffer underrun\";\n \t\treturn nullptr;\n@@ -258,7 +261,7 @@ RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stre\n \t}\n \tFrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();\n \n-\tFrameBuffer *videoBuffer = request->findBuffer(stream);\n+\tFrameBuffer *videoBuffer = request->findBuffer(&data->stream_);\n \n \tpipe_->availableParamBuffers_.pop();\n \tpipe_->availableStatBuffers_.pop();\n@@ -878,10 +881,8 @@ void PipelineHandlerRkISP1::stop(Camera *camera)\n int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n-\tStream *stream = &data->stream_;\n \n-\tRkISP1FrameInfo *info = data->frameInfo_.create(data->frame_, request,\n-\t\t\t\t\t\t\tstream);\n+\tRkISP1FrameInfo *info = data->frameInfo_.create(data, request);\n \tif (!info)\n \t\treturn -ENOENT;\n \n", "prefixes": [ "libcamera-devel", "v3", "06/22" ] }