Patch Detail
Show a patch.
GET /api/patches/18776/?format=api
{ "id": 18776, "url": "https://patchwork.libcamera.org/api/patches/18776/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18776/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20230703195725.193585-1-umang.jain@ideasonboard.com>", "date": "2023-07-03T19:57:25", "name": "[libcamera-devel] gstreamer: Add 'list-cameras' property", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": false, "hash": "757669eab8851eeabebe9adaafcb6442e6374582", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18776/mbox/", "series": [ { "id": 3947, "url": "https://patchwork.libcamera.org/api/series/3947/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3947", "date": "2023-07-03T19:57:25", "name": "[libcamera-devel] gstreamer: Add 'list-cameras' property", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3947/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18776/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18776/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E87CEBDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 3 Jul 2023 19:57:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4C808628BB;\n\tMon, 3 Jul 2023 21:57:32 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 47425628BB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 Jul 2023 21:57:30 +0200 (CEST)", "from umang.jainideasonboard.com (85-160-45-219.reb.o2.cz\n\t[85.160.45.219])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1795415E9;\n\tMon, 3 Jul 2023 21:56:46 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1688414252;\n\tbh=QyRXIJIwpoTgwWts0N6sHQAOhKnBMtnaKela3Bvn1zI=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:Cc:From;\n\tb=JYmi6bxrey0rh7NoywKp9vG5lRL/eKEITilLcQ3EvxvO1hnc0l9FP50A3SGAn+wGr\n\tcj1WTpHqRbIy3HEB/4t0eer34x/mqEQQ88IVd5sAsjqzr2yuVGWKWxGBQe86VKL0AF\n\trPaMQMlGr93sdQbvJAh3t1CkE3FX5ZdaIqyIHxN6qA8iEUDWv0bV5zAYbCr+1c5I8U\n\tb2OI+iALdeNPf0NoYB3a1QS82M5QXAalytKB0aogfzZFty5pkQmLXEZOhVtp8cSXW1\n\twKPYrBQWupXFtywKy5xcJA2TOvsObRqM44gZj9XI0cTnNohHDyX4+ECCWqALxIWgyl\n\tDEpgeaSRqcQ3w==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1688414206;\n\tbh=QyRXIJIwpoTgwWts0N6sHQAOhKnBMtnaKela3Bvn1zI=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=JWC5YB5H/6BlknOgWWfnMWUCQaDIDodVFQthqvO2NQjU/m2MioqLlsyFqXOmukweZ\n\twn8P+OyMMEqnDW2uR/ssq9h5I8ujfX7Ve/w3DVpob0AdvqYnNJg9Uva+eF8hxc08lE\n\tadub1jZsegk2AkXsE6ZjPXa9v8jBZUkhalEldGv8=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"JWC5YB5H\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 3 Jul 2023 21:57:25 +0200", "Message-Id": "<20230703195725.193585-1-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] gstreamer: Add 'list-cameras' property", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Umang Jain via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Umang Jain <umang.jain@ideasonboard.com>", "Cc": "nicolas.dufresne@collabora.com, vedantparanjape160201@gmail.com", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a new property called 'list-cameras' on libcamerasrc to enumerate\nand expose the cameras present on the system. The enumeration will help\nappplications using libcamerasrc to know and set the 'camera-name'\nproperty in order to use that camera with libcamerasrc.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/gstreamer/gstlibcamerasrc.cpp | 46 +++++++++++++++++++++++++++++++\n test/gstreamer/gstreamer_test.cpp | 30 ++++++++++++++++++++\n test/gstreamer/gstreamer_test.h | 2 ++\n 3 files changed, 78 insertions(+)", "diff": "diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex 1f10136b..f337728a 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -152,6 +152,7 @@ struct _GstLibcameraSrc {\n enum {\n \tPROP_0,\n \tPROP_CAMERA_NAME,\n+\tPROP_LIST_CAMERAS,\n \tPROP_AUTO_FOCUS_MODE,\n };\n \n@@ -666,6 +667,39 @@ gst_libcamera_src_close(GstLibcameraSrc *self)\n \tstate->cm_.reset();\n }\n \n+static gboolean\n+gst_libcamera_src_set_cameras_list(GstLibcameraSrc *self, GValue *value)\n+{\n+\tstd::shared_ptr<CameraManager> cm;\n+\tGValue val = G_VALUE_INIT;\n+\tgint ret;\n+\n+\tg_value_init(&val, G_TYPE_STRING);\n+\tg_value_reset(value);\n+\n+\tcm = gst_libcamera_get_camera_manager(ret);\n+\tif (ret) {\n+\t\tGST_ELEMENT_ERROR(self, LIBRARY, INIT,\n+\t\t\t\t (\"Failed listing cameras.\"),\n+\t\t\t\t (\"libcamera::CameraMananger::start() failed: %s\", g_strerror(-ret)));\n+\t\treturn false;\n+\t}\n+\n+\tif (cm->cameras().empty()) {\n+\t\tGST_ELEMENT_ERROR(self, RESOURCE, NOT_FOUND,\n+\t\t\t\t (\"Could not find any supported camera on this system.\"),\n+\t\t\t\t (\"libcamera::CameraMananger::cameras() is empty\"));\n+\t\treturn false;\n+\t}\n+\n+\tfor (const std::shared_ptr<Camera> &cam : cm->cameras()) {\n+\t\tg_value_set_string(&val, cam->id().c_str());\n+\t\tgst_value_array_append_value(value, &val);\n+\t}\n+\n+\treturn true;\n+}\n+\n static void\n gst_libcamera_src_set_property(GObject *object, guint prop_id,\n \t\t\t const GValue *value, GParamSpec *pspec)\n@@ -699,6 +733,9 @@ gst_libcamera_src_get_property(GObject *object, guint prop_id, GValue *value,\n \tcase PROP_CAMERA_NAME:\n \t\tg_value_set_string(value, self->camera_name);\n \t\tbreak;\n+\tcase PROP_LIST_CAMERAS:\n+\t\tgst_libcamera_src_set_cameras_list(self, value);\n+\t\tbreak;\n \tcase PROP_AUTO_FOCUS_MODE: {\n \t\tauto auto_focus_mode = self->controls->get(controls::AfMode).value_or(controls::AfModeManual);\n \t\tg_value_set_enum(value, auto_focus_mode);\n@@ -879,6 +916,15 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass)\n \t\t\t\t\t\t\t | G_PARAM_STATIC_STRINGS));\n \tg_object_class_install_property(object_class, PROP_CAMERA_NAME, spec);\n \n+\tspec = gst_param_spec_array(\"list-cameras\", \"Cameras list\",\n+\t\t\t\t \"Retrieve list of all cameras\",\n+\t\t\t\t g_param_spec_string(\"camera-name\", \"Camera name\",\n+\t\t\t\t\t\t\t\"Name of the camera\", nullptr,\n+\t\t\t\t\t\t\t(GParamFlags)(G_PARAM_READABLE\n+\t\t\t\t\t\t\t\t | G_PARAM_STATIC_STRINGS)),\n+\t\t\t\t (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));\n+\tg_object_class_install_property(object_class, PROP_LIST_CAMERAS, spec);\n+\n \tspec = g_param_spec_enum(\"auto-focus-mode\",\n \t\t\t\t \"Set auto-focus mode\",\n \t\t\t\t \"Available options: AfModeManual, \"\ndiff --git a/test/gstreamer/gstreamer_test.cpp b/test/gstreamer/gstreamer_test.cpp\nindex 6ad0c15c..7f3ccd2b 100644\n--- a/test/gstreamer/gstreamer_test.cpp\n+++ b/test/gstreamer/gstreamer_test.cpp\n@@ -97,6 +97,9 @@ bool GstreamerTest::checkMinCameraStreamsAndSetCameraName(unsigned int numStream\n \t\tbreak;\n \t}\n \n+\tfor (auto &camera : cm.cameras())\n+\t\tcameraNames_.push_back(strdup(camera->id().c_str()));\n+\n \tcm.stop();\n \n \treturn cameraFound;\n@@ -112,6 +115,9 @@ GstreamerTest::~GstreamerTest()\n \n int GstreamerTest::createPipeline()\n {\n+\tGValue cameras_list_array = G_VALUE_INIT;\n+\tguint index, i;\n+\n \tlibcameraSrc_ = gst_element_factory_make(\"libcamerasrc\", \"libcamera\");\n \tpipeline_ = gst_pipeline_new(\"test-pipeline\");\n \n@@ -125,6 +131,30 @@ int GstreamerTest::createPipeline()\n \tg_object_set(libcameraSrc_, \"camera-name\", cameraName_.c_str(), NULL);\n \tg_object_ref_sink(libcameraSrc_);\n \n+\tg_value_init(&cameras_list_array, GST_TYPE_ARRAY);\n+\tg_object_get_property(G_OBJECT(libcameraSrc_), \"list-cameras\", &cameras_list_array);\n+\tif (gst_value_array_get_size(&cameras_list_array) != cameraNames_.size()) {\n+\t\tg_printerr(\"libcamerasrc 'list-cameras' properties count does not match.\\n\");\n+\t\treturn TestFail;\n+\t}\n+\n+\tfor (index = 0; index < cameraNames_.size(); index++) {\n+\t\tbool matched = false;\n+\n+\t\tfor (i = 0; i < gst_value_array_get_size(&cameras_list_array); i++) {\n+\t\t\tconst char *cam = g_value_get_string(gst_value_array_get_value(&cameras_list_array, i));\n+\t\t\tif (strcmp(cam, cameraNames_[index]) == 0) {\n+\t\t\t\tmatched = true;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (!matched) {\n+\t\t\tg_printerr(\"Camera %s not found in 'list-cameras' property.\\n\", cameraNames_[index]);\n+\t\t\treturn TestFail;\n+\t\t}\n+\t}\n+\n \treturn TestPass;\n }\n \ndiff --git a/test/gstreamer/gstreamer_test.h b/test/gstreamer/gstreamer_test.h\nindex aa2261e2..5d61bc2a 100644\n--- a/test/gstreamer/gstreamer_test.h\n+++ b/test/gstreamer/gstreamer_test.h\n@@ -9,6 +9,7 @@\n \n #include <iostream>\n #include <unistd.h>\n+#include <vector>\n \n #include <gst/gst.h>\n \n@@ -29,6 +30,7 @@ protected:\n \tGstElement *libcameraSrc_;\n \tint status_;\n \n+\tstd::vector<const char *> cameraNames_;\n private:\n \tbool checkMinCameraStreamsAndSetCameraName(unsigned int numStreams);\n };\n", "prefixes": [ "libcamera-devel" ] }