{"id":145,"url":"https://patchwork.libcamera.org/api/patches/145/?format=json","web_url":"https://patchwork.libcamera.org/patch/145/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190103173859.22624-2-jacopo@jmondi.org>","date":"2019-01-03T17:38:55","name":"[libcamera-devel,1/5] libcamera: Add pointer to MediaDevice to MediaObject","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"78e152013228fe839ade7263b17655b0898f92c3","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/145/mbox/","series":[{"id":52,"url":"https://patchwork.libcamera.org/api/series/52/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=52","date":"2019-01-03T17:38:54","name":"libcamera: media device: Add link handling","version":1,"mbox":"https://patchwork.libcamera.org/series/52/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/145/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/145/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8D4EA60B13\n\tfor ;\n\tThu, 3 Jan 2019 18:39:02 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 265C9FF808;\n\tThu, 3 Jan 2019 17:39:01 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 3 Jan 2019 18:38:55 +0100","Message-Id":"<20190103173859.22624-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190103173859.22624-1-jacopo@jmondi.org>","References":"<20190103173859.22624-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/5] libcamera: Add pointer to MediaDevice\n\tto MediaObject","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 03 Jan 2019 17:39:02 -0000"},"content":"Add a MediaDevice member field to the MediaObject class hierarcy.\nEach media object now has a reference to the media device it belongs to,\nand which it has been created by.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/include/media_object.h | 10 ++++++----\n src/libcamera/media_device.cpp | 8 ++++----\n src/libcamera/media_object.cpp | 30 +++++++++++++++++++---------\n 3 files changed, 31 insertions(+), 17 deletions(-)","diff":"diff --git a/src/libcamera/include/media_object.h b/src/libcamera/include/media_object.h\nindex 950a332..0f0bb29 100644\n--- a/src/libcamera/include/media_object.h\n+++ b/src/libcamera/include/media_object.h\n@@ -26,10 +26,12 @@ public:\n protected:\n \tfriend class MediaDevice;\n \n-\tMediaObject(unsigned int id) : id_(id) { }\n+\tMediaObject(MediaDevice *media, unsigned int id) :\n+\t\tid_(id), media_(media) { }\n \tvirtual ~MediaObject() { }\n \n \tunsigned int id_;\n+\tMediaDevice *media_;\n };\n \n class MediaLink : public MediaObject\n@@ -42,7 +44,7 @@ public:\n private:\n \tfriend class MediaDevice;\n \n-\tMediaLink(const struct media_v2_link *link,\n+\tMediaLink(MediaDevice *media, const struct media_v2_link *link,\n \t\t MediaPad *source, MediaPad *sink);\n \tMediaLink(const MediaLink &) = delete;\n \t~MediaLink() { }\n@@ -65,7 +67,7 @@ public:\n private:\n \tfriend class MediaDevice;\n \n-\tMediaPad(const struct media_v2_pad *pad, MediaEntity *entity);\n+\tMediaPad(MediaDevice *media, const struct media_v2_pad *pad, MediaEntity *entity);\n \tMediaPad(const MediaPad &) = delete;\n \t~MediaPad();\n \n@@ -93,7 +95,7 @@ public:\n private:\n \tfriend class MediaDevice;\n \n-\tMediaEntity(const struct media_v2_entity *entity,\n+\tMediaEntity(MediaDevice *media, const struct media_v2_entity *entity,\n \t\t unsigned int major = 0, unsigned int minor = 0);\n \tMediaEntity(const MediaEntity &) = delete;\n \t~MediaEntity();\ndiff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp\nindex cf4ff90..2f9490c 100644\n--- a/src/libcamera/media_device.cpp\n+++ b/src/libcamera/media_device.cpp\n@@ -430,11 +430,11 @@ bool MediaDevice::populateEntities(const struct media_v2_topology &topology)\n \n \t\tMediaEntity *entity;\n \t\tif (iface)\n-\t\t\tentity = new MediaEntity(&mediaEntities[i],\n+\t\t\tentity = new MediaEntity(this, &mediaEntities[i],\n \t\t\t\t\t\t iface->devnode.major,\n \t\t\t\t\t\t iface->devnode.minor);\n \t\telse\n-\t\t\tentity = new MediaEntity(&mediaEntities[i]);\n+\t\t\tentity = new MediaEntity(this, &mediaEntities[i]);\n \n \t\tif (!addObject(entity)) {\n \t\t\tdelete entity;\n@@ -464,7 +464,7 @@ bool MediaDevice::populatePads(const struct media_v2_topology &topology)\n \t\t\treturn false;\n \t\t}\n \n-\t\tMediaPad *pad = new MediaPad(&mediaPads[i], mediaEntity);\n+\t\tMediaPad *pad = new MediaPad(this, &mediaPads[i], mediaEntity);\n \t\tif (!addObject(pad)) {\n \t\t\tdelete pad;\n \t\t\treturn false;\n@@ -509,7 +509,7 @@ bool MediaDevice::populateLinks(const struct media_v2_topology &topology)\n \t\t\treturn false;\n \t\t}\n \n-\t\tMediaLink *link = new MediaLink(&mediaLinks[i], source, sink);\n+\t\tMediaLink *link = new MediaLink(this, &mediaLinks[i], source, sink);\n \t\tif (!addObject(link)) {\n \t\t\tdelete link;\n \t\t\treturn false;\ndiff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\nindex 581e1c0..f1535e6 100644\n--- a/src/libcamera/media_object.cpp\n+++ b/src/libcamera/media_object.cpp\n@@ -44,14 +44,16 @@ namespace libcamera {\n *\n * MediaObject is an abstract base class for all media objects in the media\n * graph. Every media graph object is identified by an id unique in the media\n- * device context, and this base class provides that.\n+ * device context, and this base class provides both of them.\n *\n * \\sa MediaEntity, MediaPad, MediaLink\n */\n \n /**\n * \\fn MediaObject::MediaObject()\n- * \\brief Construct a MediaObject with \\a id\n+ * \\brief Construct a MediaObject with \\a id, globally unique in the MediaDevice\n+ * \\a media\n+ * \\param media The media device this object belongs to\n * \\param id The media object id\n *\n * The caller shall ensure unicity of the object id in the media device context.\n@@ -69,6 +71,11 @@ namespace libcamera {\n * \\brief The media object id\n */\n \n+/**\n+ * \\var MediaObject::media_\n+ * \\brief The media device that constructed this object\n+ */\n+\n /**\n * \\class MediaLink\n * \\brief The MediaLink represents a link between two pads in the media graph.\n@@ -82,13 +89,14 @@ namespace libcamera {\n \n /**\n * \\brief Construct a MediaLink\n+ * \\param media The media device this entity belongs to\n * \\param link The media link kernel data\n * \\param source The source pad at the origin of the link\n * \\param sink The sink pad at the destination of the link\n */\n-MediaLink::MediaLink(const struct media_v2_link *link, MediaPad *source,\n-\t\t MediaPad *sink)\n-\t: MediaObject(link->id), source_(source),\n+MediaLink::MediaLink(MediaDevice *media, const struct media_v2_link *link,\n+\t\t MediaPad *source, MediaPad *sink)\n+\t: MediaObject(media, link->id), source_(source),\n \t sink_(sink), flags_(link->flags)\n {\n }\n@@ -135,11 +143,13 @@ MediaLink::MediaLink(const struct media_v2_link *link, MediaPad *source,\n \n /**\n * \\brief Construct a MediaPad\n+ * \\param media The media device this entity belongs to\n * \\param pad The media pad kernel data\n * \\param entity The entity the pad belongs to\n */\n-MediaPad::MediaPad(const struct media_v2_pad *pad, MediaEntity *entity)\n-\t: MediaObject(pad->id), index_(pad->index), entity_(entity),\n+MediaPad::MediaPad(MediaDevice *media, const struct media_v2_pad *pad,\n+\t\t MediaEntity *entity)\n+\t: MediaObject(media, pad->id), index_(pad->index), entity_(entity),\n \t flags_(pad->flags)\n {\n }\n@@ -283,13 +293,15 @@ int MediaEntity::setDeviceNode(const std::string &devnode)\n \n /**\n * \\brief Construct a MediaEntity\n+ * \\param media The media device this entity belongs to\n * \\param entity The media entity kernel data\n * \\param major The major number of the entity associated interface\n * \\param minor The minor number of the entity associated interface\n */\n-MediaEntity::MediaEntity(const struct media_v2_entity *entity,\n+MediaEntity::MediaEntity(MediaDevice *media,\n+\t\t\t const struct media_v2_entity *entity,\n \t\t\t unsigned int major, unsigned int minor)\n-\t: MediaObject(entity->id), name_(entity->name),\n+\t: MediaObject(media, entity->id), name_(entity->name),\n \t major_(major), minor_(minor)\n {\n }\n","prefixes":["libcamera-devel","1/5"]}