From patchwork Thu Jan 31 23:51:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 469 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E56260DB4 for ; Fri, 1 Feb 2019 00:51:59 +0100 (CET) Received: from pendragon.ideasonboard.com (85-76-34-136-nat.elisa-mobile.fi [85.76.34.136]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A40AF41; Fri, 1 Feb 2019 00:51:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1548978718; bh=u+SFvPnLy1SJPtoxdBaSAHl8K46TR67NFgN/n6A8cHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bbEAkGPpKJlIWvRfDEOZIFzeEgXneIu1HgTFdWQ/0iRnUfZ4Q5PkSU+/dbegLvPfa XBIlMMjWFIpRxNUvjUqVvzy5hZ2nzyPtY0eGKGDOntLh/4oZc0aZ6uH409uNZr4AXC 6yCdhTSZAL/V+ZgWKsjAXJeNlLe2//FDNZA0q0lo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 1 Feb 2019 01:51:51 +0200 Message-Id: <20190131235151.22833-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190131234721.22606-9-laurent.pinchart@ideasonboard.com> References: <20190131234721.22606-9-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2.1 8/8] cam: Add --format option to configure a stream X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 23:51:59 -0000 From: Niklas Söderlund Add an option to configure the first stream of a camera from an argument with options and parse the width, height and pixel format from that list. The pixel format is still specified as a integer which should correspond to the kernels FOURCC identifiers. Going forward this should be turned into a string representation and the cam parser should translate between the two. Signed-off-by: Niklas Söderlund Signed-off-by: Laurent Pinchart --- Changes since v2: - Drop str2uint() Changes since v1: - Don't rename OptCamera option - Reword the format options help texts - Use the new KeyValueParser integration --- src/cam/main.cpp | 93 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 81 insertions(+), 12 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 7934d0bf4132..06f9e6e16e87 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -21,6 +21,7 @@ OptionsParser::Options options; enum { OptCamera = 'c', + OptFormat = 'f', OptHelp = 'h', OptList = 'l', }; @@ -35,11 +36,20 @@ void signalHandler(int signal) static int parseOptions(int argc, char *argv[]) { - OptionsParser parser; + KeyValueParser formatKeyValue; + formatKeyValue.addOption("width", OptionInteger, "Width in pixels", + ArgumentRequired); + formatKeyValue.addOption("height", OptionInteger, "Height in pixels", + ArgumentRequired); + formatKeyValue.addOption("pixelformat", OptionInteger, "Pixel format", + ArgumentRequired); + OptionsParser parser; parser.addOption(OptCamera, OptionString, "Specify which camera to operate on", "camera", ArgumentRequired, "camera"); + parser.addOption(OptFormat, &formatKeyValue, + "Set format of the camera's first stream", "format"); parser.addOption(OptHelp, OptionNone, "Display this help message", "help"); parser.addOption(OptList, OptionNone, "List all cameras", "list"); @@ -56,6 +66,37 @@ static int parseOptions(int argc, char *argv[]) return 0; } +bool configureStreams(Camera *camera, std::vector &streams) +{ + KeyValueParser::Options format = options[OptFormat]; + + if (streams.size() != 1) { + std::cout << "Camera has " << streams.size() + << " streams, I only know how to work with 1" + << std::endl; + return false; + } + Stream *id = streams.front(); + + std::map config = + camera->streamConfiguration(streams); + + if (format.isSet("width")) + config[id].width = format["width"]; + + if (format.isSet("height")) + config[id].height = format["height"]; + + /* TODO: Translate 4CC string to ID. */ + if (format.isSet("pixelformat")) + config[id].pixelFormat = format["pixelformat"]; + + if (camera->configureStreams(config)) + return false; + + return true; +} + int main(int argc, char **argv) { int ret; @@ -65,6 +106,8 @@ int main(int argc, char **argv) return EXIT_FAILURE; CameraManager *cm = CameraManager::instance(); + std::shared_ptr camera; + std::vector streams; ret = cm->start(); if (ret) { @@ -73,31 +116,57 @@ int main(int argc, char **argv) return EXIT_FAILURE; } + loop = new EventLoop(cm->eventDispatcher()); + + struct sigaction sa = {}; + sa.sa_handler = &signalHandler; + sigaction(SIGINT, &sa, nullptr); + if (options.isSet(OptList)) { std::cout << "Available cameras:" << std::endl; - for (const std::shared_ptr &camera : cm->cameras()) - std::cout << "- " << camera->name() << std::endl; + for (const std::shared_ptr &cam : cm->cameras()) + std::cout << "- " << cam->name() << std::endl; } if (options.isSet(OptCamera)) { - std::shared_ptr cam = cm->get(options[OptCamera]); - - if (cam) { - std::cout << "Using camera " << cam->name() << std::endl; - } else { + camera = cm->get(options[OptCamera]); + if (!camera) { std::cout << "Camera " << options[OptCamera] << " not found" << std::endl; + goto out; } + + streams = camera->streams(); + + if (camera->acquire()) { + std::cout << "Failed to acquire camera" << std::endl; + goto out; + } + + std::cout << "Using camera " << camera->name() << std::endl; } - loop = new EventLoop(cm->eventDispatcher()); + if (options.isSet(OptFormat)) { + if (!camera) { + std::cout << "Can't configure stream, no camera selected" + << std::endl; + goto out_camera; + } - struct sigaction sa = {}; - sa.sa_handler = &signalHandler; - sigaction(SIGINT, &sa, nullptr); + if (!configureStreams(camera.get(), streams)) { + std::cout << "Failed to configure camera" << std::endl; + goto out_camera; + } + } ret = loop->exec(); +out_camera: + if (camera) { + camera->release(); + camera.reset(); + } +out: delete loop; cm->stop();