From patchwork Wed May 3 12:47:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 18600 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 39DBAC0DA4 for ; Wed, 3 May 2023 12:47:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E9965633A8; Wed, 3 May 2023 14:47:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1683118069; bh=muMmIr3pG6Bpf1aB1ZYXkNTCMMxDFYKnSZlVQaVwvR0=; h=Date:To:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=gceUnlNkoJdsPYP3GG4id4A7fooyfFBV09W8OoEef9jZNzwVrSj3fjYXORLqBMcyT 1deQ5HLbgcJt32MlmDQHLVcWN3LHR9H5xBG6f233nSkMPK2kB6/klk2GiIkcX20/pS dkE2d2SzEYu1nkjtAXLCuzzpmhOKkVH5YRWWSk6JqeU3xamz2m6tFTAUnRFqnUpBl7 YqWSrAMNcICNLMfvYqBvdDHQAh97jKWGOJkRNwdRQCcyTwQsMLr+fTpQqBS4e5ChGP Zfj6gI4dgV5UhrQ9fIeVSReT+82yn1/73E4wPglpiLgycDcQ4p30J7s94MLFo0t7b7 /6uuWgvatl42w== Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E69E2627DE for ; Wed, 3 May 2023 14:47:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=protonmail.com header.i=@protonmail.com header.b="nRj7g2Q2"; dkim-atps=neutral Date: Wed, 03 May 2023 12:47:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683118066; x=1683377266; bh=QvnxbmHOT4DMMa5+YSlhrUKT9DyTFBq4cP41MvtJMMU=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=nRj7g2Q2JsKqdvSuG7jRbMnP0sVXcMkkUtIcF5zPEnh7tRmY2A/CgQ+FZnT403+hY x+Ej2b8OobVsBpiClGlKiefiSPTGPZMMozwHnFJhNJ2t1/7++Y+EyHWeu/UTZYGktV QC+s8vBLETVWPmflXuxFaHvOE1rQ+MxX8Q7EPMrWsbEY24ya1O7lfJGrU2tonWFqd0 pM5EHkFew60ttPYGza/vIT4uSdLxynEfuTY6yddfZ5x+GkHCOskdj+zVynbzcQvEp7 vA0s3g9+2gbS2pnoWBKbf5WB7yVkFfSfjgXJyegCWFDXnRmh+3R753Csy+Hakmra2U DQDz86Cot2aBQ== To: libcamera-devel@lists.libcamera.org Message-ID: <20230503124725.200550-2-pobrn@protonmail.com> In-Reply-To: <20230503124725.200550-1-pobrn@protonmail.com> References: <20230503124725.200550-1-pobrn@protonmail.com> Feedback-ID: 20568564:user:proton MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 2/2] libcamera: Remove `StreamRoles` alias 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: , X-Patchwork-Original-From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze_via_libcamera-devel?= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Reply-To: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Now that `Camera::generateConfiguration()` takes a `libcamera::Span` of `StreamRole`, remove the `StreamRoles` type, which was an alias to `std::vector`. The removal has two reasons: - it is no longer strictly necessary, - its presence may suggest that that is the preferred (or correct) way to build/pass a list of `StreamRole`. Signed-off-by: Barnabás Pőcze --- include/libcamera/stream.h | 2 -- src/apps/cam/camera_session.cpp | 2 +- src/apps/common/stream_options.cpp | 4 ++-- src/apps/common/stream_options.h | 2 +- src/apps/qcam/main_window.cpp | 2 +- src/gstreamer/gstlibcameraprovider.cpp | 5 ++--- src/gstreamer/gstlibcamerasrc.cpp | 2 +- src/libcamera/stream.cpp | 5 ----- 8 files changed, 8 insertions(+), 16 deletions(-) -- 2.40.1 diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h index 29235ddf..4e94187d 100644 --- a/include/libcamera/stream.h +++ b/include/libcamera/stream.h @@ -69,8 +69,6 @@ enum class StreamRole { Viewfinder, }; -using StreamRoles = std::vector; - std::ostream &operator<<(std::ostream &out, StreamRole role); class Stream diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 8fcec630..ecca2a97 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -55,7 +55,7 @@ CameraSession::CameraSession(CameraManager *cm, return; } - StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); + auto roles = StreamKeyValueParser::roles(options_[OptStream]); std::unique_ptr config = camera_->generateConfiguration(roles); diff --git a/src/apps/common/stream_options.cpp b/src/apps/common/stream_options.cpp index 19dfe051..663b979a 100644 --- a/src/apps/common/stream_options.cpp +++ b/src/apps/common/stream_options.cpp @@ -40,7 +40,7 @@ KeyValueParser::Options StreamKeyValueParser::parse(const char *arguments) return options; } -StreamRoles StreamKeyValueParser::roles(const OptionValue &values) +std::vector StreamKeyValueParser::roles(const OptionValue &values) { /* If no configuration values to examine default to viewfinder. */ if (values.empty()) @@ -48,7 +48,7 @@ StreamRoles StreamKeyValueParser::roles(const OptionValue &values) const std::vector &streamParameters = values.toArray(); - StreamRoles roles; + std::vector roles; for (auto const &value : streamParameters) { /* If a role is invalid default it to viewfinder. */ roles.push_back(parseRole(value.toKeyValues()).value_or(StreamRole::Viewfinder)); diff --git a/src/apps/common/stream_options.h b/src/apps/common/stream_options.h index fe298c84..a5f3bde0 100644 --- a/src/apps/common/stream_options.h +++ b/src/apps/common/stream_options.h @@ -20,7 +20,7 @@ public: KeyValueParser::Options parse(const char *arguments) override; - static libcamera::StreamRoles roles(const OptionValue &values); + static std::vector roles(const OptionValue &values); static int updateConfiguration(libcamera::CameraConfiguration *config, const OptionValue &values); diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp index 680668df..0b123d40 100644 --- a/src/apps/qcam/main_window.cpp +++ b/src/apps/qcam/main_window.cpp @@ -362,7 +362,7 @@ void MainWindow::toggleCapture(bool start) */ int MainWindow::startCapture() { - StreamRoles roles = StreamKeyValueParser::roles(options_[OptStream]); + auto roles = StreamKeyValueParser::roles(options_[OptStream]); int ret; /* Verify roles are supported. */ diff --git a/src/gstreamer/gstlibcameraprovider.cpp b/src/gstreamer/gstlibcameraprovider.cpp index 6eb0a0eb..332837e4 100644 --- a/src/gstreamer/gstlibcameraprovider.cpp +++ b/src/gstreamer/gstlibcameraprovider.cpp @@ -126,13 +126,12 @@ gst_libcamera_device_class_init(GstLibcameraDeviceClass *klass) static GstDevice * gst_libcamera_device_new(const std::shared_ptr &camera) { + static const StreamRole roles[] = { StreamRole::VideoRecording }; g_autoptr(GstCaps) caps = gst_caps_new_empty(); const gchar *name = camera->id().c_str(); - StreamRoles roles; - roles.push_back(StreamRole::VideoRecording); std::unique_ptr config = camera->generateConfiguration(roles); - if (!config || config->size() != roles.size()) { + if (!config || config->size() != std::size(roles)) { GST_ERROR("Failed to generate a default configuration for %s", name); return nullptr; } diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index a10cbd4f..46a5400e 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -468,7 +468,7 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread, GST_DEBUG_OBJECT(self, "Streaming thread has started"); gint stream_id_num = 0; - StreamRoles roles; + std::vector roles; for (GstPad *srcpad : state->srcpads_) { /* Create stream-id and push stream-start. */ g_autofree gchar *stream_id_intermediate = g_strdup_printf("%i%i", state->group_id_, stream_id_num++); diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index 67f30815..272222b7 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -436,11 +436,6 @@ std::ostream &operator<<(std::ostream &out, StreamRole role) return out; } -/** - * \typedef StreamRoles - * \brief A vector of StreamRole - */ - /** * \class Stream * \brief Video stream for a camera