From patchwork Fri Mar 14 20:29:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 22962 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 36996C32F9 for ; Fri, 14 Mar 2025 20:30:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2AA316894C; Fri, 14 Mar 2025 21:30:09 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Z6IclDZm"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1C7D56893D for ; Fri, 14 Mar 2025 21:30:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741984204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6VRDgNZ6FiWUtw57/iZciACoWNfEv5DGYZ7SovU8/E=; b=Z6IclDZmi17W7h/p9VpGduPTTSrJPSnBxH3VjntJntfz4UW3mCOJ+i6d2Tcd7McL4Ywu0b oBt8oCxM7m2vS5DTZ2lcSJb/Yt36I8OIcPRcRqZfVR8NB1TK42/E9nfRa2l4vDYodnmfMJ 9/8Y6H8SEWzl3faXanxok5Bg4s2VHxU= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-dXr0atADNBq5vIBzX6xOSQ-1; Fri, 14 Mar 2025 16:30:02 -0400 X-MC-Unique: dXr0atADNBq5vIBzX6xOSQ-1 X-Mimecast-MFC-AGG-ID: dXr0atADNBq5vIBzX6xOSQ_1741984201 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 939611801A1A; Fri, 14 Mar 2025 20:30:01 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.19]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2F1901954B32; Fri, 14 Mar 2025 20:29:59 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Laurent 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-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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Let's make the autoformatter happier. Signed-off-by: Milan Zamazal --- src/apps/cam/camera_session.cpp | 7 ++++--- src/apps/cam/kms_sink.cpp | 9 +++++---- src/apps/cam/main.cpp | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 9e934827..937a56b5 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -5,6 +5,8 @@ * Camera capture session */ +#include "camera_session.h" + #include #include #include @@ -16,7 +18,6 @@ #include "../common/event_loop.h" #include "../common/stream_options.h" -#include "camera_session.h" #include "capture_script.h" #include "file_sink.h" #ifdef HAVE_KMS @@ -248,8 +249,8 @@ int CameraSession::start() streamNames_.clear(); for (unsigned int index = 0; index < config_->size(); ++index) { StreamConfiguration &cfg = config_->at(index); - streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) - + "-stream" + std::to_string(index); + streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) + + "-stream" + std::to_string(index); } camera_->requestCompleted.connect(this, &CameraSession::requestComplete); diff --git a/src/apps/cam/kms_sink.cpp b/src/apps/cam/kms_sink.cpp index aa9459cf..def7878b 100644 --- a/src/apps/cam/kms_sink.cpp +++ b/src/apps/cam/kms_sink.cpp @@ -7,8 +7,8 @@ #include "kms_sink.h" -#include #include +#include #include #include #include @@ -122,7 +122,7 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config) for (const DRM::Mode &mode : modes) { unsigned int modeArea = mode.hdisplay * mode.vdisplay; unsigned int distance = modeArea > cfgArea ? modeArea - cfgArea - : cfgArea - modeArea; + : cfgArea - modeArea; if (distance < bestDistance) { mode_ = &mode; @@ -395,8 +395,9 @@ bool KMSSink::setupComposition(DRM::FrameBuffer *drmBuffer) /* 1. Scale the frame buffer to full screen, preserving aspect ratio. */ libcamera::Rectangle src = framebuffer; - libcamera::Rectangle dst = display.size().boundedToAspectRatio(framebuffer.size()) - .centeredTo(display.center()); + libcamera::Rectangle dst = display.size() + .boundedToAspectRatio(framebuffer.size()) + .centeredTo(display.center()); if (testModeSet(drmBuffer, src, dst)) { std::cout << "KMS: full-screen scaled output, square pixels" diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp index 460dbc81..fa266eca 100644 --- a/src/apps/cam/main.cpp +++ b/src/apps/cam/main.cpp @@ -5,6 +5,8 @@ * cam - The libcamera swiss army knife */ +#include "main.h" + #include #include #include @@ -19,7 +21,6 @@ #include "../common/stream_options.h" #include "camera_session.h" -#include "main.h" using namespace libcamera;