From patchwork Tue Mar 12 15:41:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 19686 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 56FFDBD160 for ; Tue, 12 Mar 2024 15:42:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1CC0762C85; Tue, 12 Mar 2024 16:42:46 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="XSGObq0f"; 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 05B6A6295D for ; Tue, 12 Mar 2024 16:42:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710258162; 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=jPxuKtxgiTUk3e9BLIHt9REaktcdZcb9LvsUh/cW5cY=; b=XSGObq0f16+xNbgl//cnVgSA5xldNuh4QA8rHW6bF0rElrWtcA8Zx8fNM+ObkY00mfRYrZ Jo45LomG2qaYMoVKoUum0P1P8gUyj+6rSlUDVCTQcDWT5/gItVKT9eaSlayrGjkl0Y4rVZ YNdZgZqnTeJtNnSW/vrMNcAhvHl6mUs= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-482-AFQtogffNE-Yj10Z9m_oxw-1; Tue, 12 Mar 2024 11:42:40 -0400 X-MC-Unique: AFQtogffNE-Yj10Z9m_oxw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94ED629AC027 for ; Tue, 12 Mar 2024 15:42:40 +0000 (UTC) Received: from nuthatch.brq.redhat.com (unknown [10.43.17.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20C44492BC9; Tue, 12 Mar 2024 15:42:40 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Subject: [PATCH v2 1/1] apps: cam: Add support for pnm output format Date: Tue, 12 Mar 2024 16:41:46 +0100 Message-ID: <20240312154146.1135416-2-mzamazal@redhat.com> In-Reply-To: <20240312154146.1135416-1-mzamazal@redhat.com> References: <20240312154146.1135416-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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" When file output is requested from cam app, it simply dumps the processed data and it must be converted to a readable image format manually. Let's add support for pnm output file format to make files produced by cam directly readable by image display and processing software. For now, only BGR888 output format, which is the simplest one to use, is supported but nothing prevents adding support for other output formats if needed. Signed-off-by: Milan Zamazal Reviewed-by: Kieran Bingham --- src/apps/cam/file_sink.cpp | 11 +++++++ src/apps/cam/main.cpp | 2 ++ src/apps/common/meson.build | 1 + src/apps/common/pnm_writer.cpp | 54 ++++++++++++++++++++++++++++++++++ src/apps/common/pnm_writer.h | 18 ++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 src/apps/common/pnm_writer.cpp create mode 100644 src/apps/common/pnm_writer.h diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp index dca350c4..3db59925 100644 --- a/src/apps/cam/file_sink.cpp +++ b/src/apps/cam/file_sink.cpp @@ -16,6 +16,7 @@ #include #include "../common/dng_writer.h" +#include "../common/pnm_writer.h" #include "../common/image.h" #include "file_sink.h" @@ -73,6 +74,7 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer, if (!pattern_.empty()) filename = pattern_; + bool pnm = filename.find(".pnm", filename.size() - 4) != std::string::npos; #ifdef HAVE_TIFF bool dng = filename.find(".dng", filename.size() - 4) != std::string::npos; #endif /* HAVE_TIFF */ @@ -90,6 +92,15 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer, Image *image = mappedBuffers_[buffer].get(); + if (pnm) { + ret = PNMWriter::write(filename.c_str(), stream->configuration(), + image->data(0).data()); + if (ret < 0) + std::cerr << "failed to write PNM file `" << filename + << "'" << std::endl; + + return; + } #ifdef HAVE_TIFF if (dng) { ret = DNGWriter::write(filename.c_str(), camera_, diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp index 179cc376..cdaa0baa 100644 --- a/src/apps/cam/main.cpp +++ b/src/apps/cam/main.cpp @@ -150,6 +150,8 @@ int CamApp::parseOptions(int argc, char *argv[]) "to write files, using the default file name. Otherwise it sets the\n" "full file path and name. The first '#' character in the file name\n" "is expanded to the camera index, stream name and frame sequence number.\n" + "If the file name ends with '.pnm', then the frame will be written to\n" + "the output file(s) in PNM format.\n" #ifdef HAVE_TIFF "If the file name ends with '.dng', then the frame will be written to\n" "the output file(s) in DNG format.\n" diff --git a/src/apps/common/meson.build b/src/apps/common/meson.build index 479326cd..47b7e41a 100644 --- a/src/apps/common/meson.build +++ b/src/apps/common/meson.build @@ -3,6 +3,7 @@ apps_sources = files([ 'image.cpp', 'options.cpp', + 'pnm_writer.cpp', 'stream_options.cpp', ]) diff --git a/src/apps/common/pnm_writer.cpp b/src/apps/common/pnm_writer.cpp new file mode 100644 index 00000000..b505f97e --- /dev/null +++ b/src/apps/common/pnm_writer.cpp @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024 Red Hat, Inc. + * + * pnm_writer.cpp - PNM writer + */ + +#include "pnm_writer.h" + +#include +#include + +#include +#include + +using namespace libcamera; + +int PNMWriter::write(const char *filename, + const StreamConfiguration &config, + const void *data) +{ + if (config.pixelFormat != formats::BGR888) { + std::cerr << "Only BGR888 output pixel format is supported (" + << config.pixelFormat << " requested)" << std::endl; + return -EINVAL; + } + + std::ofstream output(filename, std::ios::binary); + if (!output) { + std::cerr << "Failed to open pnm file: " << filename << std::endl; + return -EINVAL; + } + + output << "P6" << std::endl + << config.size.width << " " << config.size.height << std::endl + << "255" << std::endl; + if (!output) { + std::cerr << "Failed to write the file header" << std::endl; + return -EINVAL; + } + + const unsigned int rowLength = config.size.width * 3; + const unsigned int paddedRowLength = config.stride; + const char *row = reinterpret_cast(data); + for (unsigned int y = 0; y < config.size.height; y++, row += paddedRowLength) { + output.write(row, rowLength); + if (!output) { + std::cerr << "Failed to write image data at row " << y << std::endl; + return -EINVAL; + } + } + + return 0; +} diff --git a/src/apps/common/pnm_writer.h b/src/apps/common/pnm_writer.h new file mode 100644 index 00000000..a0ae4587 --- /dev/null +++ b/src/apps/common/pnm_writer.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2020, Raspberry Pi Ltd + * + * pnm_writer.h - PNM writer + */ + +#pragma once + +#include + +class PNMWriter +{ +public: + static int write(const char *filename, + const libcamera::StreamConfiguration &config, + const void *data); +};