Patch Detail
Show a patch.
GET /api/patches/8685/?format=api
{ "id": 8685, "url": "https://patchwork.libcamera.org/api/patches/8685/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8685/", "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": "<20200708134417.67747-17-paul.elder@ideasonboard.com>", "date": "2020-07-08T13:44:12", "name": "[libcamera-devel,v4,16/21] libcamera: rkisp1: Fill stride and frameSize at config validation", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7a23270b2a4926b7ed66531519a812c869db0bbf", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8685/mbox/", "series": [ { "id": 1090, "url": "https://patchwork.libcamera.org/api/series/1090/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1090", "date": "2020-07-08T13:43:56", "name": "Clean up formats in v4l2-compat and pipeline handlers", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1090/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8685/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8685/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 21A41BD792\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 8 Jul 2020 13:45:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E434A6114E;\n\tWed, 8 Jul 2020 15:45:04 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E2E0E61143\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 8 Jul 2020 15:45:03 +0200 (CEST)", "from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6EADA51B;\n\tWed, 8 Jul 2020 15:45:02 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"oR535Msj\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594215903;\n\tbh=adx+NstpqLwusRYFJCxGhc5+a16g4Y2IFq66xKcj2IE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=oR535MsjZQC23sN24XnZCalelnighifu8gboDEjyg/wWkcHeOgsLDJD9B08dfyJO5\n\tv4BVioFosygi1lE5RfShQhIep2pBceq4wTlCQj3Sali753QSYUGbfkkOVdZUw+Fdlc\n\ts06ftpVgiW3PmkZsl23VdVfiYIiSRbEy9BQGv5bg=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 8 Jul 2020 22:44:12 +0900", "Message-Id": "<20200708134417.67747-17-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200708134417.67747-1-paul.elder@ideasonboard.com>", "References": "<20200708134417.67747-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 16/21] libcamera: rkisp1: Fill stride\n\tand frameSize at config validation", "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=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Fill the stride and frameSize fields of the StreamConfiguration at\nconfiguration validation time instead of at camera configuration time.\nThis allows applications to get the stride when trying a configuration\nwithout modifying the active configuration of the camera.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v4:\n- mention motivation in commit message\n- get stride and frameSize from tryFormat on the capture video node\n\nNew in v3\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 20 ++++++++++++++++----\n 1 file changed, 16 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 3c3f3f3..5ac2ecc 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -115,9 +115,9 @@ public:\n class RkISP1CameraData : public CameraData\n {\n public:\n-\tRkISP1CameraData(PipelineHandler *pipe)\n+\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *video)\n \t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n-\t\t frameInfo_(pipe)\n+\t\t frameInfo_(pipe), video_(video)\n \t{\n \t}\n \n@@ -135,6 +135,8 @@ public:\n \tRkISP1Frames frameInfo_;\n \tRkISP1Timeline timeline_;\n \n+\tV4L2VideoDevice *video_;\n+\n private:\n \tvoid queueFrameAction(unsigned int frame,\n \t\t\t const IPAOperationData &action);\n@@ -535,6 +537,17 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \n \tcfg.bufferCount = RKISP1_BUFFER_COUNT;\n \n+\tV4L2DeviceFormat format = {};\n+\tformat.fourcc = data_->video_->toV4L2PixelFormat(cfg.pixelFormat);\n+\tformat.size = cfg.size;\n+\n+\tint ret = data_->video_->tryFormat(&format);\n+\tif (ret)\n+\t\treturn Invalid;\n+\n+\tcfg.stride = format.planes[0].bpl;\n+\tcfg.frameSize = format.planes[0].size;\n+\n \treturn status;\n }\n \n@@ -683,7 +696,6 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \tcfg.setStream(&data->stream_);\n-\tcfg.stride = outputFormat.planes[0].bpl;\n \n \treturn 0;\n }\n@@ -934,7 +946,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tint ret;\n \n \tstd::unique_ptr<RkISP1CameraData> data =\n-\t\tstd::make_unique<RkISP1CameraData>(this);\n+\t\tstd::make_unique<RkISP1CameraData>(this, video_);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\n", "prefixes": [ "libcamera-devel", "v4", "16/21" ] }