{"id":22962,"url":"https://patchwork.libcamera.org/api/1.1/patches/22962/?format=json","web_url":"https://patchwork.libcamera.org/patch/22962/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20250314202943.112109-3-mzamazal@redhat.com>","date":"2025-03-14T20:29:30","name":"[RFC,2/7] apps: cam: Formatting fixes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ca77376d256252908fef49f6ad6a5212250021eb","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22962/mbox/","series":[{"id":5062,"url":"https://patchwork.libcamera.org/api/1.1/series/5062/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5062","date":"2025-03-14T20:29:28","name":"Support different outputs for cam streams","version":1,"mbox":"https://patchwork.libcamera.org/series/5062/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22962/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22962/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 36996C32F9\n\tfor ;\n\tFri, 14 Mar 2025 20:30:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2AA316894C;\n\tFri, 14 Mar 2025 21:30:09 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C7D56893D\n\tfor ;\n\tFri, 14 Mar 2025 21:30:05 +0100 (CET)","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-626-dXr0atADNBq5vIBzX6xOSQ-1;\n\tFri, 14 Mar 2025 16:30:02 -0400","from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 939611801A1A; Fri, 14 Mar 2025 20:30:01 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.19])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 2F1901954B32; Fri, 14 Mar 2025 20:29:59 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Z6IclDZm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1741984204;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=/6VRDgNZ6FiWUtw57/iZciACoWNfEv5DGYZ7SovU8/E=;\n\tb=Z6IclDZmi17W7h/p9VpGduPTTSrJPSnBxH3VjntJntfz4UW3mCOJ+i6d2Tcd7McL4Ywu0b\n\toBt8oCxM7m2vS5DTZ2lcSJb/Yt36I8OIcPRcRqZfVR8NB1TK42/E9nfRa2l4vDYodnmfMJ\n\t9/8Y6H8SEWzl3faXanxok5Bg4s2VHxU=","X-MC-Unique":"dXr0atADNBq5vIBzX6xOSQ-1","X-Mimecast-MFC-AGG-ID":"dXr0atADNBq5vIBzX6xOSQ_1741984201","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tLaurent Pinchart ","Subject":"[RFC PATCH 2/7] apps: cam: Formatting fixes","Date":"Fri, 14 Mar 2025 21:29:30 +0100","Message-ID":"<20250314202943.112109-3-mzamazal@redhat.com>","In-Reply-To":"<20250314202943.112109-1-mzamazal@redhat.com>","References":"<20250314202943.112109-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.40","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"rhWjfO4Pad3syw2orXQOrcZ8fF1Qhha6cWqktCu4bOo_1741984201","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Let's make the autoformatter happier.\n\nSigned-off-by: Milan Zamazal \n---\n src/apps/cam/camera_session.cpp | 7 ++++---\n src/apps/cam/kms_sink.cpp | 9 +++++----\n src/apps/cam/main.cpp | 3 ++-\n 3 files changed, 11 insertions(+), 8 deletions(-)","diff":"diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 9e934827..937a56b5 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -5,6 +5,8 @@\n * Camera capture session\n */\n \n+#include \"camera_session.h\"\n+\n #include \n #include \n #include \n@@ -16,7 +18,6 @@\n #include \"../common/event_loop.h\"\n #include \"../common/stream_options.h\"\n \n-#include \"camera_session.h\"\n #include \"capture_script.h\"\n #include \"file_sink.h\"\n #ifdef HAVE_KMS\n@@ -248,8 +249,8 @@ int CameraSession::start()\n \tstreamNames_.clear();\n \tfor (unsigned int index = 0; index < config_->size(); ++index) {\n \t\tStreamConfiguration &cfg = config_->at(index);\n-\t\tstreamNames_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n-\t\t\t\t\t + \"-stream\" + std::to_string(index);\n+\t\tstreamNames_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_) +\n+\t\t\t\t\t \"-stream\" + std::to_string(index);\n \t}\n \n \tcamera_->requestCompleted.connect(this, &CameraSession::requestComplete);\ndiff --git a/src/apps/cam/kms_sink.cpp b/src/apps/cam/kms_sink.cpp\nindex aa9459cf..def7878b 100644\n--- a/src/apps/cam/kms_sink.cpp\n+++ b/src/apps/cam/kms_sink.cpp\n@@ -7,8 +7,8 @@\n \n #include \"kms_sink.h\"\n \n-#include \n #include \n+#include \n #include \n #include \n #include \n@@ -122,7 +122,7 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)\n \tfor (const DRM::Mode &mode : modes) {\n \t\tunsigned int modeArea = mode.hdisplay * mode.vdisplay;\n \t\tunsigned int distance = modeArea > cfgArea ? modeArea - cfgArea\n-\t\t\t\t : cfgArea - modeArea;\n+\t\t\t\t\t\t\t : cfgArea - modeArea;\n \n \t\tif (distance < bestDistance) {\n \t\t\tmode_ = &mode;\n@@ -395,8 +395,9 @@ bool KMSSink::setupComposition(DRM::FrameBuffer *drmBuffer)\n \n \t/* 1. Scale the frame buffer to full screen, preserving aspect ratio. */\n \tlibcamera::Rectangle src = framebuffer;\n-\tlibcamera::Rectangle dst = display.size().boundedToAspectRatio(framebuffer.size())\n-\t\t\t\t\t\t .centeredTo(display.center());\n+\tlibcamera::Rectangle dst = display.size()\n+\t\t\t\t\t .boundedToAspectRatio(framebuffer.size())\n+\t\t\t\t\t .centeredTo(display.center());\n \n \tif (testModeSet(drmBuffer, src, dst)) {\n \t\tstd::cout << \"KMS: full-screen scaled output, square pixels\"\ndiff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp\nindex 460dbc81..fa266eca 100644\n--- a/src/apps/cam/main.cpp\n+++ b/src/apps/cam/main.cpp\n@@ -5,6 +5,8 @@\n * cam - The libcamera swiss army knife\n */\n \n+#include \"main.h\"\n+\n #include \n #include \n #include \n@@ -19,7 +21,6 @@\n #include \"../common/stream_options.h\"\n \n #include \"camera_session.h\"\n-#include \"main.h\"\n \n using namespace libcamera;\n \n","prefixes":["RFC","2/7"]}