From patchwork Mon May 19 09:20:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 23389 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 7AE68BD78E for ; Mon, 19 May 2025 09:23:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9173D68D7C; Mon, 19 May 2025 11:23:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="cGBBtjuR"; dkim-atps=neutral Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id ED80B68D82 for ; Mon, 19 May 2025 11:22:53 +0200 (CEST) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a361c8a830so413028f8f.0 for ; Mon, 19 May 2025 02:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1747646573; x=1748251373; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TDFSDhxsWtnuegD2eNp0so8bkMmcVepBWj9qp8gGI+4=; b=cGBBtjuRCD5MwpEsu+RNJkvvDvGVDUG3HgAUdXt89YtlAMgw2pjvuGcvfkRYVmGTIf FOzLOK8wWo4OPetB7Dzn8vRlWXCPEaMhUZxDhgoIFn/Un31VoJJ/mtSJSXa/1+5vKuUG JGZvc/n14m0xfKgjzzwPnlYJsplZq4nQZrRqnoPPt8cHVIteavEHZjmPsetkMSyXC3GH vzQMa8FsjcM/MSmHQYq50CuuL3FXPI47yftSv7eFZ40sQ8MfdZ/jai0a4ptCk4zjKc05 NbPRmW4UlhnzLWGj1oy4Ir0mITS6/xOA9/YzDVCMu0eonIEeR0mZfLUXxe8mogSjOMDh PBIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747646573; x=1748251373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TDFSDhxsWtnuegD2eNp0so8bkMmcVepBWj9qp8gGI+4=; b=nMeZ6nluGqQGSzty4+eW4vzCMjbr0stDcO8RIAbVOIUa7Py8mYHJnKBPpaxV7i1/qJ 0Z7ITmx8n12qj1ZM0rVYIkBSRRm1C1+rPaiD5WNH1J0LsxgEFlPj6l7udeAgsG9u9fco 93UwxyiLcNb0wDmIvnWwiil5XeWZ608aWAh/zXSJiiL0VOjAgAVvT3FoxprEnxsClheh M47gaZtxqd8KMhe5iSk0hicpap0BerGP4PU4NIsgjgxCcbCPfUImfEQRvsBnOjKZ0IqX vPCam/4xftDQeIBHMURC+YHN2B8ql/IeYdnIDEqPuDOuQxT80iRsjyDju5JJQGg4xmVc M9rQ== X-Gm-Message-State: AOJu0YwQG57MqqpmLSfRM/sKhVBKr35UXOoYX8N8fv4oDHv86OF8ktPu lXz7597CTYTydUiZJMPYD0ohP7dNjHrUPDOs1N4OMT8kgGBXvezA1PeFoBJtPlwwg4M/tOzHGKp fuFQK X-Gm-Gg: ASbGncsozmqAuquM/uZEc9eQw9j5uiP3Cqr2VOBuL2EVwU7TBXhyMxt3JPGnV/goUAS QYGsxWxdQV8Tql59Gqd//ncwovRbzDcRmtbsZmPiVQbZ/v2OzNDSvw1VFLiXfYvcXsDR9qAwXZU bV6uljfgYGF639fSeEAHcEZQ9D4upQkjST3LjV1xndpoOABQJYBN9d2vWzSSDyxNkPN5GcaPNlb I9teY9g1uVpNq8t2CK0hNdx1KJzfXo5eUFoxGGFMGbGnOYbzsXw7Gz5K84JDHPaXYJv6Nkgm47o N0EVtc+onF16GpmGv4upUjE0lO3/lMOLg6P21KPcVnlwPq2FQ+wkWAH5vxWgdXMuQG0YbIg= X-Google-Smtp-Source: AGHT+IF2tysLNeEBGECrTG+UjzZ3WrZk7mSIXTGYp3ZjmlsJXuaBKtg+zKMHsEswEqmLr/kkbEfJNQ== X-Received: by 2002:a05:6000:438a:b0:3a3:75ea:f9d3 with SMTP id ffacd0b85a97d-3a375eafce5mr315084f8f.11.1747646573249; Mon, 19 May 2025 02:22:53 -0700 (PDT) Received: from NAUSH-P-DELL.pitowers.org ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a366e08747sm8645961f8f.95.2025.05.19.02.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 02:22:52 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Cc: Naushir Patuck Subject: [PATCH v1 4/6] pipeline: rpi: Remove disable_startup_frame_drops config option Date: Mon, 19 May 2025 10:20:52 +0100 Message-ID: <20250519092245.269048-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250519092245.269048-1-naush@raspberrypi.com> References: <20250519092245.269048-1-naush@raspberrypi.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" With the previous change to not drop frames in the pipeline handler, the "disable_startup_frame_drops" pipeline config option is not used. Remove it, and throw a warning if the option is present in the YAML config file. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman (config_.disableStartupFrameDrops); + if (phConfig.contains("disable_startup_frame_drops")) + LOG(RPI, Warning) + << "The disable_startup_frame_drops key is now deprecated, " + << "please use FrameMetadata::Status::FrameStartup instead."; config_.cameraTimeoutValue = phConfig["camera_timeout_value_ms"].get(config_.cameraTimeoutValue); diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h index 6023f9f9d6b3..e27c4f860d1a 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h @@ -164,11 +164,6 @@ public: bool buffersAllocated_; struct Config { - /* - * Override any request from the IPA to drop a number of startup - * frames. - */ - bool disableStartupFrameDrops; /* * Override the camera timeout value calculated by the IPA based * on frame durations. diff --git a/src/libcamera/pipeline/rpi/pisp/data/example.yaml b/src/libcamera/pipeline/rpi/pisp/data/example.yaml index d67e654a8b9e..baf03be79bb3 100644 --- a/src/libcamera/pipeline/rpi/pisp/data/example.yaml +++ b/src/libcamera/pipeline/rpi/pisp/data/example.yaml @@ -16,11 +16,6 @@ # # "num_cfe_config_queue": 2, - # Override any request from the IPA to drop a number of startup - # frames. - # - # "disable_startup_frame_drops": false, - # Custom timeout value (in ms) for camera to use. This overrides # the value computed by the pipeline handler based on frame # durations. diff --git a/src/libcamera/pipeline/rpi/vc4/data/example.yaml b/src/libcamera/pipeline/rpi/vc4/data/example.yaml index b8e01adeaf40..27e543488d48 100644 --- a/src/libcamera/pipeline/rpi/vc4/data/example.yaml +++ b/src/libcamera/pipeline/rpi/vc4/data/example.yaml @@ -29,11 +29,6 @@ # # "min_total_unicam_buffers": 4, - # Override any request from the IPA to drop a number of startup - # frames. - # - # "disable_startup_frame_drops": false, - # Custom timeout value (in ms) for camera to use. This overrides # the value computed by the pipeline handler based on frame # durations.