From patchwork Fri Mar 12 05:47:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11559 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 BE80FBD1F1 for ; Fri, 12 Mar 2021 05:47:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7209C68C6B; Fri, 12 Mar 2021 06:47:39 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JyDe18xw"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3C2CD68C6A for ; Fri, 12 Mar 2021 06:47:34 +0100 (CET) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CD6F88F9; Fri, 12 Mar 2021 06:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1615528054; bh=RKxT41wukt/83iJeLfzLWLhu6Ut9PVoijpveHju7Dwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JyDe18xwAuO8Yhuz3nj+ZgCmIr/PVt/OLKh08QsDd9blnfdepp5hM3IJMbgGSRucx nlNOLvAS0J/0olQHYzSirgkUutnrucsezLvNoKjZpPH15XtgA9i9zDV1dymrZ25t4R czBhQvIhC/93o3UfLGsQD/prgYd6RRG8ru2l6aF0= From: Kieran Bingham To: libcamera devel Date: Fri, 12 Mar 2021 05:47:27 +0000 Message-Id: <20210312054727.852622-9-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210312054727.852622-1-kieran.bingham@ideasonboard.com> References: <20210312054727.852622-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 8/8] libcamera: pipeline: ipu3: Fail if the FrameInfo can't be found 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 FrameInfo structure associates the data sent to the IPA and is essential for handling events. If it can not be found, this is a fatal error which must be fixed. Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/ipu3/ipu3.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index c5facaea16dd..a61e2b51ef9e 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -1168,8 +1168,10 @@ void IPU3CameraData::queueFrameAction(unsigned int id, } case ipa::ipu3::ActionParamFilled: { IPU3Frames::Info *info = frameInfos_.find(id); - if (!info) + if (!info) { + LOG(IPU3, Fatal) << "No frameInfo for ActionParamFilled on ID: " << id; break; + } /* Queue all buffers from the request aimed for the ImgU. */ for (auto it : info->request->buffers()) { @@ -1190,8 +1192,10 @@ void IPU3CameraData::queueFrameAction(unsigned int id, } case ipa::ipu3::ActionMetadataReady: { IPU3Frames::Info *info = frameInfos_.find(id); - if (!info) + if (!info) { + LOG(IPU3, Fatal) << "No frameInfo for ActionMetadataReady on ID: " << id; break; + } /* * \todo Parse the value of the controls returned by the IPA