From patchwork Tue Feb 25 16:41:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 22867 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 D48EBBDB1C for ; Tue, 25 Feb 2025 16:41:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 92F3D6872D; Tue, 25 Feb 2025 17:41:48 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ClkalRXy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 567D06871F for ; Tue, 25 Feb 2025 17:41:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740501707; x=1772037707; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nS0he6M5+OnKyzidaXn9nLdjZWwtir6ALzW2zaXi0yQ=; b=ClkalRXyLENlLRliCsQrnXNc7YbLU9ClxG4fOHFTxtaEP6Q46aJBLW/B Z4LIWmbK+kLx9geuLab4QBuVJysKHeyvZDN0X0XmTwIViAHjjmYW4U7vd tmEqo9LTgkS400YS1u5OiC9hmwfSvF0BLLH98D83ufbJ6oa3Jjf5oig/X ewCGxCaOwZSNJQ1TDqHiBeJ3Li9EEtD9K47QB3VmPFgBcjIJYghMSj+3t xzcB71vxGBoodYtYOtLole5wBgyQAVpTUA436S1SaSOWYwWyESyHs3eto CZMoOrHROfDZzKNGFbocnj84HZYgZtRgm8kO9iFYu+u/KpMUHNB4rpB72 Q==; X-CSE-ConnectionGUID: gdOkO2jQTjKTK138JBipjw== X-CSE-MsgGUID: cl6RS+4URfGegkRfR2ZNHA== X-IronPort-AV: E=McAfee;i="6700,10204,11356"; a="51948277" X-IronPort-AV: E=Sophos;i="6.13,314,1732608000"; d="scan'208";a="51948277" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2025 08:41:45 -0800 X-CSE-ConnectionGUID: sp+c/Qg9SVWuZM571qW0Xg== X-CSE-MsgGUID: UtSGXvnRQkSvuO6USAR7Bw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,314,1732608000"; d="scan'208";a="116426747" Received: from sgruszka-mobl.ger.corp.intel.com (HELO localhost) ([10.245.115.185]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2025 08:41:42 -0800 From: Stanislaw Gruszka To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Laurent Pinchart , Kieran Bingham , Naushir Patuck , Sakari Ailus , Hans de Goede Subject: [PATCH v5 3/5] pipeline: simple: Connect and disconnect start frame events Date: Tue, 25 Feb 2025 17:41:14 +0100 Message-Id: <20250225164116.414301-4-stanislaw.gruszka@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225164116.414301-1-stanislaw.gruszka@linux.intel.com> References: <20250225164116.414301-1-stanislaw.gruszka@linux.intel.com> 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" Enable frame events on the emitter device during SimplePipelineHandler::start(), move signal connection there from SimplePipelineHandler::configure(). Also reset delayed controls on start() to prevent using stale values. Accordingly disable/disconnect on SimplePipelineHandler::stopDevice(). This fixes the assertion like below: ../src/libcamera/delayed_controls.cpp:227: libcamera::ControlList libcamera::DelayedControls::get(uint32_t): Assertion `info.type() != ControlTypeNone' failed which can happen rarely at the beginning of streaming when ControlRingBuffer is not yet filled and there are errors on CSI-2. In such rare scenario we can have call to DelayedControls::get() with frame number that exceed number of saved entries. Handing frame start signal assure we do DelayedConntrols::applyControls() with (possibly out of sequence) frame number and later call to DelayedControls::get() will get proper not-empty control entry. Bug: https://bugs.libcamera.org/show_bug.cgi?id=241 Co-developed-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Stanislaw Gruszka --- src/libcamera/pipeline/simple/simple.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) -- 2.43.0 diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 063a098f..774c7824 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -1229,7 +1229,6 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) static_cast(c); SimpleCameraData *data = cameraData(camera); V4L2VideoDevice *video = data->video_; - V4L2Subdevice *frameStartEmitter = data->frameStartEmitter_; int ret; /* @@ -1300,9 +1299,6 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) data->delayedCtrls_ = std::make_unique(data->sensor_->device(), params); - if (frameStartEmitter) - frameStartEmitter->frameStart.connect(data->delayedCtrls_.get(), - &DelayedControls::applyControls); StreamConfiguration inputCfg; inputCfg.pixelFormat = pipeConfig->captureFormat; @@ -1341,6 +1337,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL { SimpleCameraData *data = cameraData(camera); V4L2VideoDevice *video = data->video_; + V4L2Subdevice *frameStartEmitter = data->frameStartEmitter_; int ret; const MediaPad *pad = acquirePipeline(data); @@ -1370,6 +1367,17 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL video->bufferReady.connect(data, &SimpleCameraData::imageBufferReady); + data->delayedCtrls_->reset(); + if (frameStartEmitter) { + ret = frameStartEmitter->setFrameStartEnabled(true); + if (ret) { + stop(camera); + return ret; + } + frameStartEmitter->frameStart.connect(data->delayedCtrls_.get(), + &DelayedControls::applyControls); + } + ret = video->streamOn(); if (ret < 0) { stop(camera); @@ -1401,6 +1409,13 @@ void SimplePipelineHandler::stopDevice(Camera *camera) { SimpleCameraData *data = cameraData(camera); V4L2VideoDevice *video = data->video_; + V4L2Subdevice *frameStartEmitter = data->frameStartEmitter_; + + if (frameStartEmitter) { + frameStartEmitter->setFrameStartEnabled(false); + frameStartEmitter->frameStart.disconnect(data->delayedCtrls_.get(), + &DelayedControls::applyControls); + } if (data->useConversion_) { if (data->converter_)