From patchwork Fri Nov 26 00:31:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 14785 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 48A61C324F for ; Fri, 26 Nov 2021 00:31:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F39D460490; Fri, 26 Nov 2021 01:31:32 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DkrA1GMp"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0893C6011D for ; Fri, 26 Nov 2021 01:31:29 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 137so6826287wma.1 for ; Thu, 25 Nov 2021 16:31:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aemq21Ri5fdhqriXaF8QcTIZVoJtSLB/xFzBO4uxDmg=; b=DkrA1GMpPAsPY8fqANUNBP0sLDXrxNVoAOKBubxBokPKd/lytFc6w7E1sy38McXf25 erRvKmh9WDjzX6L7NIeNnAsmw+T1NsXGzb8I8sFNf3zjQu+Il5dAs0c4U6H2fJnTdHXI E+dQ2w42Md8vZ/SNxTmkQdIh4wvYPDD2COcedFodHThEpUYnLEbsxYeFzUhou6ZrVjq/ SHOKK3xZSSn9KYCeBAYMRBmeBIolecoWt/VuLRfhMI6xpNCChPAZq6imYr7J7XgjFdOZ oWtjlnlt/Rxe5IYlFA/96Hl+KovwhdIql8usY+3dEfeIYVP2WASg5+6AVPAO5jZ2ai3x 5v7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aemq21Ri5fdhqriXaF8QcTIZVoJtSLB/xFzBO4uxDmg=; b=gqNQ8DUhM/DD90V/SjO7lBxd6C/rcnyfNwTQZIf3D/0dQkbGuXrzoEUtkskFmU3ewA LH9bPUd0oN9VuekNCa4cXcNQTdKb/jB8Ut/AWVU/FpGUp9mW3rrNkGkT3l3feCQSCQ2g Tmykp1Frk+41bIF3jGBdbezIguTgdT+nTaxPu1QO3+/lflbiQlViTFTm1vZxwFNLwrcU 2bq/dC+UwV8E5Hi+NKuzxfsWImA3MqN+OSwVkdQ/Cgc+m1SZV/CljRMPu8kc9oo2PAyq UEvndaIvRMG/v4OFPIZuliRMefLlLGgOc8CbHMoZLg5Gni5A6DBl56jrSQOpSpQ7OC0+ FzIw== X-Gm-Message-State: AOAM532m9zfWCgQdOc4jxvPYFc37dqp+E/dfmByAh/PboAxceqRpiqSr c0Cur0h8qNDMM18FhZUqcAIdbAc6mIY= X-Google-Smtp-Source: ABdhPJwO4ZEO0HcV/cvWw9t5QPJ6AI7x0UGlk84rhKoIJBxss4Rxyx/aQp0wBLpLdFP8fi3KHFBtbA== X-Received: by 2002:a7b:cf18:: with SMTP id l24mr12085405wmg.145.1637886688820; Thu, 25 Nov 2021 16:31:28 -0800 (PST) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id b188sm4381455wmd.45.2021.11.25.16.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 16:31:28 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Nov 2021 00:31:15 +0000 Message-Id: <20211126003118.42356-3-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126003118.42356-1-djrscally@gmail.com> References: <20211126003118.42356-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/5] libcamera: media_device: Handle ancillary links in populateLinks() 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 populateLinks() function can't currently handle ancillary links which causes an error to be thrown in process() when the MediaObject cannot be cast to a MediaPad. Add explicit handling for the different link types, creating either pad-2-pad or entity-2-entity versions of a MediaLink based on the link type in the link's flags. Signed-off-by: Daniel Scally --- include/linux/media.h | 1 + src/libcamera/media_device.cpp | 52 ++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/include/linux/media.h b/include/linux/media.h index 17432318..e3123d1a 100644 --- a/include/linux/media.h +++ b/include/linux/media.h @@ -222,6 +222,7 @@ struct media_pad_desc { #define MEDIA_LNK_FL_LINK_TYPE (0xf << 28) # define MEDIA_LNK_FL_DATA_LINK (0 << 28) # define MEDIA_LNK_FL_INTERFACE_LINK (1 << 28) +# define MEDIA_LNK_FL_ANCILLARY_LINK (2 << 28) struct media_link_desc { struct media_pad_desc source; diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index aa93da75..8133c534 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -699,45 +699,67 @@ bool MediaDevice::populateLinks(const struct media_v2_topology &topology) { struct media_v2_link *mediaLinks = reinterpret_cast (topology.ptr_links); + unsigned int link_type; + MediaLink *link; for (unsigned int i = 0; i < topology.num_links; ++i) { /* * Skip links between entities and interfaces: we only care - * about pad-2-pad links here. + * about pad-2-pad and entity-2-entity links here. */ if ((mediaLinks[i].flags & MEDIA_LNK_FL_LINK_TYPE) == MEDIA_LNK_FL_INTERFACE_LINK) continue; - /* Store references to source and sink pads in the link. */ + /* Store references to source and sink objects in the link. */ unsigned int source_id = mediaLinks[i].source_id; - MediaPad *source = dynamic_cast - (object(source_id)); + MediaObject *source = object(source_id); if (!source) { LOG(MediaDevice, Error) - << "Failed to find pad with id: " + << "Failed to find MediaObject with id: " << source_id; return false; } unsigned int sink_id = mediaLinks[i].sink_id; - MediaPad *sink = dynamic_cast - (object(sink_id)); + MediaObject *sink = object(sink_id); if (!sink) { LOG(MediaDevice, Error) - << "Failed to find pad with id: " + << "Failed to find MediaObject with id: " << sink_id; return false; } - MediaLink *link = new MediaLink(&mediaLinks[i], source, sink); - if (!addObject(link)) { - delete link; - return false; - } + link_type = mediaLinks[i].flags & MEDIA_LNK_FL_LINK_TYPE; + + switch (link_type) { + case MEDIA_LNK_FL_DATA_LINK: + link = new MediaLink(&mediaLinks[i], + dynamic_cast(source), + dynamic_cast(sink)); + if (!addObject(link)) { + delete link; + return false; + } + + link->source()->addLink(link); + link->sink()->addLink(link); - source->addLink(link); - sink->addLink(link); + break; + case MEDIA_LNK_FL_ANCILLARY_LINK: + link = new MediaLink(&mediaLinks[i], + dynamic_cast(source), + dynamic_cast(sink)); + if (!addObject(link)) { + delete link; + return false; + } + + link->primary()->addLink(link); + link->ancillary()->addLink(link); + + break; + } } return true;