From patchwork Tue Mar 24 08:53:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 26320 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 8D0EBBE086 for ; Tue, 24 Mar 2026 08:56:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CB6CF6277D; Tue, 24 Mar 2026 09:56:17 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="JvgKbkWS"; dkim-atps=neutral Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F4CF62010 for ; Tue, 24 Mar 2026 09:56:15 +0100 (CET) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-43b527ac5d0so1839553f8f.2 for ; Tue, 24 Mar 2026 01:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1774342575; x=1774947375; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mmvpptHl0lxYLm/QPncpa1bCeN+O2Eofb6RUrsroVQE=; b=JvgKbkWShIw2Q6PPbdz6H0zvbRWfKpuILzvrG36RcBsNLgco96Qe6J+zaEkyAdYjbx 3tI3mEFUnUN4s0smIyvmQjX63a6QmT1li5/nl6uHVqNCIa5DrcbtcC4IJNFeea/3x3Uj Se9G7Jwlz/QljJLIEcrJQoSS9Iw3IljTpdsZpHnbIpQoaRpYinuZJ9sMUYjPMPomWu/Q DSOM7V7J9FqdHW2ZBaYwboDPqIDkm32Lshkp0s0+vZp4hGCYCKDXLlqaA8gzEehC15u9 qJGtG/ffFHQAwRYJ7B7JmiZzpbHTWIX2secv3Bx/tG7W0Iov7CSYgRQUPaP3DR3n9Kfi hUjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774342575; x=1774947375; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mmvpptHl0lxYLm/QPncpa1bCeN+O2Eofb6RUrsroVQE=; b=Y/sVP75sOjpdHzurjO0E2VTDdV1XfxBTt4RufFPtHqFqJMWBjAbjhAodcaMi0jJwCD NKhsTGyOBVLN2mmxs3Mxjz6xQOCv3VfUeb7Sa6hMYKgl/okWhrILebKYpPLbG/AdR4ut +PmjHQ1adebQIBai5Qxm83nAZqJ97ZywcwxzXAD1viIOkJ86+7og48VOnspIiymBhaUh 1KqkmKpxwSTdPNZDGlj//3m4N7gMbRwJONjyMBB/J+KVc63bRULYKebrOvf6p2GAdDLO LHwV92Y1PT8RKBihs+DsNUtLvc7ln+zFJRQqClAUgHhtoF0r1qXqcaIcSowcS7UDppcN +YsQ== X-Gm-Message-State: AOJu0YzL/mmzY36KNpsxKRNsBK9yECoGVLHDldGgR4ZZz/V4SlPcIFBn cQOY9906QKcNy/VD8Bp4lyoeLfyUVTqV+WAV3M8/lC2GmOKdIj1I0yq8fsUkFF0iZaxmqiru1cl tGcZk X-Gm-Gg: ATEYQzwN0Q/g4dctkXL4AMqZi1w+3lynPYIPTUq+1nhHnAuiVViaElTS4qZW1z+x9aT K7ZaCkd+Cy1+s3WDw2g5BSJIKuX2XIhRGUKBj3PnAGtOUl9MlKRaxw4ramylZT/WXtdpzLTtBow TARrhKkpss5xhDhC/4HFlgrevfK0MSr0ydMX04KBl4PV3mgydHIHEtBvqCpA7LDyJ1UMtPf75xb N2tsfm4Z/uQeeZ06bCijLG5tl8xfObqBTmfHkUjF8cbFGBhFxVaXTkPi6FhfFkuhrcBBimkNmxi HrFTgYqjhUxiHBNabKe6PIrdrc/OsE+gjDLK1H4RFhy2DD/t1C/5IurpOhpyLEXhEoB2alTllAm T5dYzdIokAvwm5vZbq2i35DCuY9tvalOlWiVhHxrZ7ueBtaSdW8SwJ7k13PlFEKID2uVTgWCanr 1VmtPZKhVaJXx9RzxJyOaSdky77utgE+xD6i0+cnlKwHtHgu58kKyyeeQgCZmoX026+uRo1jQcp QDS/KrjfoPsEmiLgpDId4uGVecKi3Cs3kTBC1IROQ== X-Received: by 2002:a5d:5f49:0:b0:439:fcd5:c9bb with SMTP id ffacd0b85a97d-43b64277e32mr24773451f8f.34.1774342574659; Tue, 24 Mar 2026 01:56:14 -0700 (PDT) Received: from davidp-pi5.pitowers.org ([2a00:1098:3142:1f:88ea:c658:5b20:5e46]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b6470c239sm36461512f8f.27.2026.03.24.01.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 01:56:14 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Cc: David Plowman Subject: [PATCH v2] gstreamer: Add sensor-config property Date: Tue, 24 Mar 2026 08:53:56 +0000 Message-ID: <20260324085612.14533-1-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.47.3 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" The sensor-config property may optionally be specified to give the outputSize and bitDepth of the SensorConfiguration that is applied to the camera configuration. For example, use libcamerasrc sensor-config="sensor/config,width=2304,height=1296,depth=10" to request the 10-bit 2304x1296 mode of a sensor. All three parameters, width, height and bit depth, must be present, or it will issue a warning and revert to automatic mode selection (as if there were no sensor-config at all). If a mode is requested that doesn't exist then camera configuration will fail and the pipeline won't start. As future-proofing, the SensorConfiguration's binning and increment parameters may be specified, though libcamera currently ignores them. Signed-off-by: David Plowman Closes: https://gitlab.freedesktop.org/camera/libcamera/-/issues/300 --- src/gstreamer/gstlibcamerasrc.cpp | 61 +++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index a7241e9b..c7c183dd 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -141,6 +141,7 @@ struct _GstLibcameraSrc { GstTask *task; gchar *camera_name; + GstStructure *sensor_config; std::atomic pending_eos; @@ -152,6 +153,7 @@ struct _GstLibcameraSrc { enum { PROP_0, PROP_CAMERA_NAME, + PROP_SENSOR_CONFIG, PROP_LAST }; @@ -846,6 +848,44 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread, } g_assert(state->config_->size() == state->srcpads_.size()); + /* Apply optional sensor configuration. */ + if (self->sensor_config) { + gint w = 0, h = 0, depth = 0; + if (!gst_structure_get_int(self->sensor_config, "width", &w) || + !gst_structure_get_int(self->sensor_config, "height", &h) || + !gst_structure_get_int(self->sensor_config, "depth", &depth) || + w <= 0 || h <= 0 || depth <= 0) { + GST_ELEMENT_WARNING(self, RESOURCE, SETTINGS, + ("sensor-config requires non-zero width, height and depth" + " fields, ignoring"), + (nullptr)); + } else { + SensorConfiguration sensorCfg; + sensorCfg.outputSize = Size(w, h); + sensorCfg.bitDepth = depth; + + /* Optional binning (defaults to 1x1). */ + gint binX = 0, binY = 0; + if (gst_structure_get_int(self->sensor_config, "bin-x", &binX) && binX > 0) + sensorCfg.binning.binX = binX; + if (gst_structure_get_int(self->sensor_config, "bin-y", &binY) && binY > 0) + sensorCfg.binning.binY = binY; + + /* Optional skipping (defaults to 1 for all increments). */ + gint xOddInc = 0, xEvenInc = 0, yOddInc = 0, yEvenInc = 0; + if (gst_structure_get_int(self->sensor_config, "x-odd-inc", &xOddInc) && xOddInc > 0) + sensorCfg.skipping.xOddInc = xOddInc; + if (gst_structure_get_int(self->sensor_config, "x-even-inc", &xEvenInc) && xEvenInc > 0) + sensorCfg.skipping.xEvenInc = xEvenInc; + if (gst_structure_get_int(self->sensor_config, "y-odd-inc", &yOddInc) && yOddInc > 0) + sensorCfg.skipping.yOddInc = yOddInc; + if (gst_structure_get_int(self->sensor_config, "y-even-inc", &yEvenInc) && yEvenInc > 0) + sensorCfg.skipping.yEvenInc = yEvenInc; + + state->config_->sensorConfig = sensorCfg; + } + } + if (!gst_libcamera_src_negotiate(self)) { state->initControls_.clear(); GST_ELEMENT_FLOW_ERROR(self, GST_FLOW_NOT_NEGOTIATED); @@ -934,6 +974,10 @@ gst_libcamera_src_set_property(GObject *object, guint prop_id, g_free(self->camera_name); self->camera_name = g_value_dup_string(value); break; + case PROP_SENSOR_CONFIG: + g_clear_pointer(&self->sensor_config, gst_structure_free); + self->sensor_config = gst_structure_copy((GstStructure *)g_value_get_boxed(value)); + break; default: if (!state->controls_.setProperty(prop_id - PROP_LAST, value, pspec)) G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -953,6 +997,9 @@ gst_libcamera_src_get_property(GObject *object, guint prop_id, GValue *value, case PROP_CAMERA_NAME: g_value_set_string(value, self->camera_name); break; + case PROP_SENSOR_CONFIG: + g_value_set_boxed(value, self->sensor_config); + break; default: if (!state->controls_.getProperty(prop_id - PROP_LAST, value, pspec)) G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -1040,6 +1087,7 @@ gst_libcamera_src_finalize(GObject *object) g_clear_object(&self->task); g_mutex_clear(&self->state->lock_); g_free(self->camera_name); + g_clear_pointer(&self->sensor_config, gst_structure_free); delete self->state; return klass->finalize(object); @@ -1162,6 +1210,19 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass) | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_CAMERA_NAME, spec); + spec = g_param_spec_boxed("sensor-config", "Sensor Config", + "Desired sensor configuration as a GstStructure with mandatory " + "fields width, height and depth, and optional fields bin-x, bin-y, " + "x-odd-inc, x-even-inc, y-odd-inc, y-even-inc " + "(e.g. \"sensor/config,width=2304,height=1296,depth=10\"). " + "Leave unset to let the pipeline negotiate the sensor mode automatically.", + GST_TYPE_STRUCTURE, + (GParamFlags)(GST_PARAM_MUTABLE_READY + | G_PARAM_CONSTRUCT + | G_PARAM_READWRITE + | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_SENSOR_CONFIG, spec); + GstCameraControls::installProperties(object_class, PROP_LAST); }