From patchwork Tue Jul 29 15:39:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 24025 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 47230BDCC1 for ; Tue, 29 Jul 2025 15:39:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B664B691E3; Tue, 29 Jul 2025 17:39:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="qJPWarSJ"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 54C4D691DF for ; Tue, 29 Jul 2025 17:39:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9jVbr35+9uY5BjBQRrH243IuCTaDVtSj1oyPbVCwzPg=; b=qJPWarSJxn0bT48gi8WC5dpxPY p1+HlxzryTWrxmTF+qwOi2VsHZYu9v/psLAkPuMvF0UhsQLJCFwnZUqsWblMQhzISAa39FoqxvRfG nomfZQS9HpCZ4pnDyp8kxur7fXQdxZuvSa8npv0wabh0l05CqDEBvt8GboPI9zwmrcP5Mwg7pfUF0 U/GhuAq2NLI8KPsHBLZ5nYOZDnK9QSYmY24cfRybmyRDiIWaOQAxFq1uCI7TfVFTfG4Zb1oGZ0A8x 3hkoD08SM8h36hLlNjVrSwaaK87UesakzupSzJtAe43T4Cj4/0l4GOK9R7KYVYaZSxWuodsv8b4Tr 7GpDXGiQ==; Received: from [49.36.71.87] (helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1ugmQ7-005UrS-BK; Tue, 29 Jul 2025 17:39:15 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Jaslo Ziska , Nicolas Dufresne , Umang Jain Subject: [PATCH v5 2/3] gstreamer: Move existing GValue helpers to gstreamer-utils Date: Tue, 29 Jul 2025 21:09:14 +0530 Message-ID: <20250729153915.159243-3-uajain@igalia.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250729153915.159243-1-uajain@igalia.com> References: <20250729153915.159243-1-uajain@igalia.com> MIME-Version: 1.0 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" Move the existing GValue helpers from gstlibcamera-controls.cpp.in to gstreamer-utils.cpp. The intention here is to make these helpers available to other parts of gstreamer source element, for example, reporting camera properties in GstDeviceProvider. The function signature has been changed to match with the other gstreamer-utils utility functions: value_get_rectangle() => gst_libcamera_gvalue_get_rectangle() value_set_rectangle() => gst_libcamera_gvalue_set_rectangle() value_set_point() => gst_libcamera_gvalue_set_point() value_set_size() => gst_libcamera_gvalue_set_size() Signed-off-by: Umang Jain Reviewed-by: Nicolas Dufresne --- src/gstreamer/gstlibcamera-controls.cpp.in | 56 ++-------------------- src/gstreamer/gstlibcamera-utils.cpp | 47 ++++++++++++++++++ src/gstreamer/gstlibcamera-utils.h | 4 ++ 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/src/gstreamer/gstlibcamera-controls.cpp.in b/src/gstreamer/gstlibcamera-controls.cpp.in index 1bc781cc..6faf3ee7 100644 --- a/src/gstreamer/gstlibcamera-controls.cpp.in +++ b/src/gstreamer/gstlibcamera-controls.cpp.in @@ -14,56 +14,10 @@ #include #include "gstlibcamera-controls.h" +#include "gstlibcamera-utils.h" using namespace libcamera; -static void value_set_point(GValue *value, const Point &point) -{ - GValue x = G_VALUE_INIT; - g_value_init(&x, G_TYPE_INT); - g_value_set_int(&x, point.x); - gst_value_array_append_and_take_value(value, &x); - - GValue y = G_VALUE_INIT; - g_value_init(&y, G_TYPE_INT); - g_value_set_int(&y, point.y); - gst_value_array_append_and_take_value(value, &y); -} - -static void value_set_size(GValue *value, const Size &size) -{ - GValue width = G_VALUE_INIT; - g_value_init(&width, G_TYPE_INT); - g_value_set_int(&width, size.width); - gst_value_array_append_and_take_value(value, &width); - - GValue height = G_VALUE_INIT; - g_value_init(&height, G_TYPE_INT); - g_value_set_int(&height, size.height); - gst_value_array_append_and_take_value(value, &height); -} - -static void value_set_rectangle(GValue *value, const Rectangle &rect) -{ - value_set_point(value, rect.topLeft()); - value_set_size(value, rect.size()); -} - -static Rectangle value_get_rectangle(const GValue *value) -{ - const GValue *r; - r = gst_value_array_get_value(value, 0); - int x = g_value_get_int(r); - r = gst_value_array_get_value(value, 1); - int y = g_value_get_int(r); - r = gst_value_array_get_value(value, 2); - int w = g_value_get_int(r); - r = gst_value_array_get_value(value, 3); - int h = g_value_get_int(r); - - return Rectangle(x, y, w, h); -} - {% for vendor, ctrls in controls %} {%- for ctrl in ctrls if ctrl.is_enum %} static const GEnumValue {{ ctrl.name|snake_case }}_types[] = { @@ -179,7 +133,7 @@ bool GstCameraControls::getProperty(guint propId, GValue *value, GValue element = G_VALUE_INIT; {%- if ctrl.is_rectangle %} g_value_init(&element, GST_TYPE_PARAM_ARRAY_LIST); - value_set_rectangle(&element, control[i]); + gst_libcamera_gvalue_set_rectangle(&element, control[i]); {%- else %} g_value_init(&element, G_TYPE_{{ ctrl.gtype|upper }}); g_value_set_{{ ctrl.gtype }}(&element, control[i]); @@ -188,7 +142,7 @@ bool GstCameraControls::getProperty(guint propId, GValue *value, } {%- else %} {%- if ctrl.is_rectangle %} - value_set_rectangle(value, control); + gst_libcamera_gvalue_set_rectangle(value, control); {%- else %} g_value_set_{{ ctrl.gtype }}(value, control); {%- endif %} @@ -252,7 +206,7 @@ bool GstCameraControls::setProperty(guint propId, const GValue *value, i); return true; } - values[i] = value_get_rectangle(element); + values[i] = gst_libcamera_gvalue_get_rectangle(element); {%- else %} values[i] = g_value_get_{{ ctrl.gtype }}(element); {%- endif %} @@ -271,7 +225,7 @@ bool GstCameraControls::setProperty(guint propId, const GValue *value, "array of size 4"); return true; } - Rectangle val = value_get_rectangle(value); + Rectangle val = gst_libcamera_gvalue_get_rectangle(value); {%- else %} auto val = g_value_get_{{ ctrl.gtype }}(value); {%- endif %} diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index a548b0c1..63e00fe0 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -584,6 +584,53 @@ void gst_libcamera_framerate_to_caps(GstCaps *caps, const GstStructure *element_ gst_structure_set(s, "framerate", GST_TYPE_FRACTION, fps_caps_n, fps_caps_d, nullptr); } +void gst_libcamera_gvalue_set_point(GValue *value, const Point &point) +{ + GValue x = G_VALUE_INIT; + g_value_init(&x, G_TYPE_INT); + g_value_set_int(&x, point.x); + gst_value_array_append_and_take_value(value, &x); + + GValue y = G_VALUE_INIT; + g_value_init(&y, G_TYPE_INT); + g_value_set_int(&y, point.y); + gst_value_array_append_and_take_value(value, &y); +} + +void gst_libcamera_gvalue_set_size(GValue *value, const Size &size) +{ + GValue width = G_VALUE_INIT; + g_value_init(&width, G_TYPE_INT); + g_value_set_int(&width, size.width); + gst_value_array_append_and_take_value(value, &width); + + GValue height = G_VALUE_INIT; + g_value_init(&height, G_TYPE_INT); + g_value_set_int(&height, size.height); + gst_value_array_append_and_take_value(value, &height); +} + +void gst_libcamera_gvalue_set_rectangle(GValue *value, const Rectangle &rect) +{ + gst_libcamera_gvalue_set_point(value, rect.topLeft()); + gst_libcamera_gvalue_set_size(value, rect.size()); +} + +Rectangle gst_libcamera_gvalue_get_rectangle(const GValue *value) +{ + const GValue *r; + r = gst_value_array_get_value(value, 0); + int x = g_value_get_int(r); + r = gst_value_array_get_value(value, 1); + int y = g_value_get_int(r); + r = gst_value_array_get_value(value, 2); + int w = g_value_get_int(r); + r = gst_value_array_get_value(value, 3); + int h = g_value_get_int(r); + + return Rectangle(x, y, w, h); +} + #if !GST_CHECK_VERSION(1, 17, 1) gboolean gst_task_resume(GstTask *task) diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h index 5f4e8a0f..1812be75 100644 --- a/src/gstreamer/gstlibcamera-utils.h +++ b/src/gstreamer/gstlibcamera-utils.h @@ -25,6 +25,10 @@ void gst_libcamera_clamp_and_set_frameduration(libcamera::ControlList &controls, const libcamera::ControlInfoMap &camera_controls, GstStructure *element_caps); void gst_libcamera_framerate_to_caps(GstCaps *caps, const GstStructure *element_caps); +void gst_libcamera_gvalue_set_point(GValue *value, const libcamera::Point &point); +void gst_libcamera_gvalue_set_size(GValue *value, const libcamera::Size &size); +void gst_libcamera_gvalue_set_rectangle(GValue *value, const libcamera::Rectangle &rect); +libcamera::Rectangle gst_libcamera_gvalue_get_rectangle(const GValue *value); #if !GST_CHECK_VERSION(1, 16, 0) static inline void gst_clear_event(GstEvent **event_ptr)