From patchwork Thu Dec 9 13:32:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 15101 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 EFC70BF415 for ; Thu, 9 Dec 2021 13:33:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B06B060890; Thu, 9 Dec 2021 14:32:59 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="cnQ0RPb8"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 235CD6086A for ; Thu, 9 Dec 2021 14:32:57 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id o19-20020a1c7513000000b0033a93202467so4088365wmc.2 for ; Thu, 09 Dec 2021 05:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nJnkmgQAsgdErldvbjoJq1Zg/UvxAKQrj2jHEwu8eT0=; b=cnQ0RPb8In0cnqTpOntQS1pQV1d8GjZiWD/654Siwn325l+MfKeqsQiGvsk3imu8IE CghP+yWJwrfUEGMuGf8Oor20VEYx02LEcUU8zOpMFY3cUEaXGpkdxJRQPAyegNDPs2b2 qKwYn2jELjFjDtq7qM0E8CxvaW7stuQoBpZzwSsulmnsMrTui0zmQBM+thL5Pu7v37bg NWA/YzK5M7ybLPQFbiswIGHrSsPBPk9qXWEd5ah+P1qrBiIj2bZWH8mg/4eRRFALR439 qaTktJ462K6Nu+vghk4yWiinAd4xQkyxRbbKA02O33vNXLujhsZVNt2kXb7R+tFziD0+ 8Qaw== 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=nJnkmgQAsgdErldvbjoJq1Zg/UvxAKQrj2jHEwu8eT0=; b=51wNWr+fjgF1099E6Ek83ojdQBUh11fciaAQzcdcAA6a6fpE2/Ck/CiqMaUalFciNv BgIGyEBknWwQUe7WDIdaNEcZnc6UvTRZiI+75FrwubdxRHWttdCb8upBl3QmhjhT0IJj WiZgApjtx4W1t4SxjUYIW6zNBO0toGleEAbB8z1VWNnYdvRf0LAKVVVv+Kr44svQNVaj JWUYF6RGfnfl6gIzsDH+Au+v0lkvhV3LCEBlUQdiPBnbW9xeuKDAEeguU0SadNxrHFS4 ThwCVzG6i9SKpnJYv6CfCrxF12IO7viunR+7UMEyIJbsEoDx+VXPfetg6BaJvWLIImf9 tt2Q== X-Gm-Message-State: AOAM531psP+oRx3nDfR1e3aTMTIqYKMOeQWYZjiO4E5g+REySYTu7djE UmDaNHzfVdAKogvasSV/Md2yEggOppLvJXgP X-Google-Smtp-Source: ABdhPJxW2pc3ItQvRGfUN1u8Mo5OL14lwNo8GMNnrQYooZxZRJR05UVCQ3vdnekQtTNb/97P82meYQ== X-Received: by 2002:a05:600c:3658:: with SMTP id y24mr7242621wmq.161.1639056776530; Thu, 09 Dec 2021 05:32:56 -0800 (PST) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:a3bd:8799:8317:6d3f]) by smtp.gmail.com with ESMTPSA id r15sm8449244wmh.13.2021.12.09.05.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Dec 2021 05:32:56 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Thu, 9 Dec 2021 13:32:51 +0000 Message-Id: <20211209133252.2234668-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211209133252.2234668-1-naush@raspberrypi.com> References: <20211209133252.2234668-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/2] pipeline: raspberrypi: Move sensor entity detection out of registerCamera() 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" Enumerate the sensor device entities in PipelineHandlerRPi::match() and loop over PipelineHandlerRPi::registerCamera() for each sensor found. This will allow the pipeline handler to register multiple cameras attached to a single Unicam instance with a Video Mux device. Signed-off-by: Naushir Patuck Reviewed-by: Kieran Bingham --- .../pipeline/raspberrypi/raspberrypi.cpp | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 86851ac467ad..2a2fb5273eb8 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -310,7 +310,7 @@ private: return static_cast(camera->_d()); } - int registerCamera(MediaDevice *unicam, MediaDevice *isp); + int registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity); int queueAllBuffers(Camera *camera); int prepareBuffers(Camera *camera); void freeBuffers(Camera *camera); @@ -1029,16 +1029,28 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator) return false; } - int ret = registerCamera(unicamDevice, ispDevice); - if (ret) { - LOG(RPI, Error) << "Failed to register camera: " << ret; - return false; + /* + * The loop below is used to register multiple cameras behind one or more + * video mux devices that are attached to a particular Unicam instance. + * Obviously these cameras cannot be used simultaneously. + */ + unsigned int numCameras = 0; + for (MediaEntity *entity : unicamDevice->entities()) { + if (entity->function() != MEDIA_ENT_F_CAM_SENSOR) + continue; + + int ret = registerCamera(unicamDevice, ispDevice, entity); + if (ret) + LOG(RPI, Error) << "Failed to register camera " + << entity->name() << ": " << ret; + else + numCameras++; } - return true; + return !!numCameras; } -int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp) +int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, MediaEntity *sensorEntity) { std::unique_ptr data = std::make_unique(this); @@ -1079,14 +1091,7 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp) data->isp_[Isp::Output1].dev()->bufferReady.connect(data.get(), &RPiCameraData::ispOutputDequeue); data->isp_[Isp::Stats].dev()->bufferReady.connect(data.get(), &RPiCameraData::ispOutputDequeue); - /* Identify the sensor. */ - for (MediaEntity *entity : unicam->entities()) { - if (entity->function() == MEDIA_ENT_F_CAM_SENSOR) { - data->sensor_ = std::make_unique(entity); - break; - } - } - + data->sensor_ = std::make_unique(sensorEntity); if (!data->sensor_) return -EINVAL;