{"id":11092,"url":"https://patchwork.libcamera.org/api/patches/11092/?format=json","web_url":"https://patchwork.libcamera.org/patch/11092/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210131224702.8838-14-laurent.pinchart@ideasonboard.com>","date":"2021-01-31T22:46:55","name":"[libcamera-devel,13/20] libcamera: pipeline: simple: Rename Configuration::pixelFormat","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3110d9d4e787967b88a4085a4bb935d16f28ff0f","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/11092/mbox/","series":[{"id":1633,"url":"https://patchwork.libcamera.org/api/series/1633/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1633","date":"2021-01-31T22:46:42","name":"[libcamera-devel,01/20] libcamera: pipeline: simple: Manage converter with std::unique_ptr<>","version":1,"mbox":"https://patchwork.libcamera.org/series/1633/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11092/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11092/checks/","tags":{},"headers":{"Return-Path":"","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 132E8BD808\n\tfor ;\n\tSun, 31 Jan 2021 22:47:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D5F5D68407;\n\tSun, 31 Jan 2021 23:47:42 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 268EC683F0\n\tfor ;\n\tSun, 31 Jan 2021 23:47:33 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A56A4813;\n\tSun, 31 Jan 2021 23:47:32 +0100 (CET)"],"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=\"Lrd7D9U8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612133252;\n\tbh=fonE0GucruxFPXXcNqlmLbRBju4Gc3HNXtuLFHyP8e8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Lrd7D9U8lRjrWLrg4KYRpmNEdzIQ4jPr5kz2JUy4NScz7x/5nWBS0iESLh+/D/iHQ\n\tYxOQ1dcL7+88XxXRd5kIpL3Mm63qeaHjeYFHylT8fOBynSlY6sbctGGQRM+bYb1C2T\n\tYGhJ3+A0IuaqBUC5sJG3UFQXDrybw301b+r1xbLY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 1 Feb 2021 00:46:55 +0200","Message-Id":"<20210131224702.8838-14-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 13/20] libcamera: pipeline: simple: Rename\n\tConfiguration::pixelFormat","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Phi-Bang Nguyen ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Configuration::pixelFormat field stores the pixel format at the\noutput of the capture part of the pipeline. Rename it to captureFormat,\nto match the related captureSize field.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/pipeline/simple/simple.cpp | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 7c5a56a2f395..72a18cc0b97f 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -157,7 +157,7 @@ public:\n \n \tstruct Configuration {\n \t\tuint32_t code;\n-\t\tPixelFormat pixelFormat;\n+\t\tPixelFormat captureFormat;\n \t\tSize captureSize;\n \t\tSizeRange outputSizes;\n \t};\n@@ -379,7 +379,7 @@ int SimpleCameraData::init()\n \n \t\t\tConfiguration config;\n \t\t\tconfig.code = code;\n-\t\t\tconfig.pixelFormat = pixelFormat;\n+\t\t\tconfig.captureFormat = pixelFormat;\n \t\t\tconfig.captureSize = format.size;\n \n \t\t\tif (!converter) {\n@@ -551,7 +551,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\tstatus = Adjusted;\n \t}\n \n-\tneedConversion_ = cfg.pixelFormat != pipeConfig.pixelFormat\n+\tneedConversion_ = cfg.pixelFormat != pipeConfig.captureFormat\n \t\t\t|| cfg.size != pipeConfig.captureSize;\n \n \tcfg.bufferCount = 3;\n@@ -656,7 +656,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \t/* Configure the video node. */\n-\tV4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.pixelFormat);\n+\tV4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.captureFormat);\n \n \tV4L2DeviceFormat captureFormat;\n \tcaptureFormat.fourcc = videoFormat;\n@@ -686,7 +686,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \n \tif (useConverter_) {\n \t\tStreamConfiguration inputCfg;\n-\t\tinputCfg.pixelFormat = pipeConfig.pixelFormat;\n+\t\tinputCfg.pixelFormat = pipeConfig.captureFormat;\n \t\tinputCfg.size = pipeConfig.captureSize;\n \t\tinputCfg.stride = captureFormat.planes[0].bpl;\n \t\tinputCfg.bufferCount = cfg.bufferCount;\n","prefixes":["libcamera-devel","13/20"]}