From patchwork Thu May 22 07:48:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 23419 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 32D07C331D for ; Thu, 22 May 2025 07:53:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4998068D9B; Thu, 22 May 2025 09:52:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="cEh9Ag+g"; dkim-atps=neutral Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 620EB68D95 for ; Thu, 22 May 2025 09:52:50 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3a361c8a830so955264f8f.0 for ; Thu, 22 May 2025 00:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1747900370; x=1748505170; 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=PQbXpP6ym6kMA9r51U3/3ckVgPiXTqaSa9FB8oZ25C4=; b=cEh9Ag+gN+GBUDvW2KcIkLuMDc6NeksBz7vDpVgSStzUA8hRrpSwxxxkX7moGri2AB 2iW+T6aHOP+qOOUs1uf/gqKecZJMpZ9sbTLm4Lh3uIhuq67imUE4qIAcwyWNXu20e5UW NPZrPqYCMIbwmxJ0Re/inMCWkeX4PluQXN7X6UMf7G8Oc2rQmmWL4Gm4JtEFlkJMVRe9 81c6/J1FcGaS3MCXQ1wVcqbkaj6aIs/aY78BuXidNOiOaAkpMYtVAZ2PIrlPCLwIjkfG rBKsTA4K9Tc8lUHz59JHD2mhiA3Yfx52HTAt9O/WUCWlFNN3TE1jNp46Ika10JJgSEIL z/Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747900370; x=1748505170; 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=PQbXpP6ym6kMA9r51U3/3ckVgPiXTqaSa9FB8oZ25C4=; b=dpm/u4V/xpFl5CeSd6UQe9/jHiMyVojrmAknQD8moBc5CIT8UcGEp/obpq1yHL3VGf 8NV/a7snLERneZFkRl2EEZD29uvPJx68uK3c9dFzwUuHSZYQhi3Da4W2ovjTW6rRrbCF n68FQ9NVoIm9WJsJfbJm0dt6wnVBJ0yUKoGc5M0zrddKK0dGsDfxgicQ8D3soX+ieN92 cZK9UWOJu1Qqo05dl4alLg8rcSZ8MipiDg+qzAn/xLWC+inG33bMPsEr0Gyk5oN9Teom ROaj+jeP/dDdsqtCVYFm79gCZvZKaDdAiFxbj7S7IrPUmvzzZMxA+BofbwnOjd/vj4VS 3hRw== X-Gm-Message-State: AOJu0Yw5EW+ljaOwnE4L63KDIcRgQkmRLdQCrSKimcEzdF27uZIeOSAH drn6iulfBtFF3szfQqnyAJw+/ko0YVFh+/L/hGwmPNeEVhRlh2hOt7HYMAyLcn+bjNA9LTfhmQj nyCqL X-Gm-Gg: ASbGnctP9dkhVtJxPX2faJnd9ds70u1kYVWGC8E5d5762Cc5dhyUu9A+OS9/YUKlM3d WlWHDdSZHTuSgl2eT8AX6BLfWFVjxkJE8mIYaiIuDxNS8cI31JOGPcRonMSDTdcOnktHC+W8vDY 226MhCJZ3RaG7h2prUCpS0XnqxxRIOJIITcbWKDHuLLM45i8So6L9Hsbts4oTAiPfc/aIG4B1XZ Va1yw+oaqfhr542uM76fFm7zyI/SVTMBQ5bFEGFpB9upm3fAKRMefD0oSX3Vf7GNBX1QXxvIIOc 9lKd0/rPwCQwVZ4uK8Iv5jEiGF/hRxOjbynT3lOaKZWfIeDX5cdiywhyUj4QWWEgtjmLXOQ= X-Google-Smtp-Source: AGHT+IEgzSjIQ4mF2VDv5rkzgsdusSIdr381GPwG6V3jXa8OuBlLObH+1Wq4Azq9gdcP+Lng3OhJmA== X-Received: by 2002:a05:6000:1884:b0:3a3:73dd:92b4 with SMTP id ffacd0b85a97d-3a373dd9431mr4591291f8f.4.1747900369639; Thu, 22 May 2025 00:52:49 -0700 (PDT) Received: from NAUSH-P-DELL.pitowers.org ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a3ca066eb7sm4191516f8f.2.2025.05.22.00.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 00:52:49 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Cc: Naushir Patuck , David Plowman Subject: [PATCH v2 4/6] pipeline: rpi: Remove disable_startup_frame_drops config option Date: Thu, 22 May 2025 08:48:20 +0100 Message-ID: <20250522075244.1198110-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522075244.1198110-1-naush@raspberrypi.com> References: <20250522075244.1198110-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 --- src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 7 ++++--- src/libcamera/pipeline/rpi/common/pipeline_base.h | 5 ----- src/libcamera/pipeline/rpi/pisp/data/example.yaml | 5 ----- src/libcamera/pipeline/rpi/vc4/data/example.yaml | 5 ----- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 3f0b7abdc59a..bef057a70353 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -1078,7 +1078,6 @@ void CameraData::enumerateVideoDevices(MediaLink *link, const std::string &front int CameraData::loadPipelineConfiguration() { config_ = { - .disableStartupFrameDrops = false, .cameraTimeoutValue = 0, }; @@ -1115,8 +1114,10 @@ int CameraData::loadPipelineConfiguration() const YamlObject &phConfig = (*root)["pipeline_handler"]; - config_.disableStartupFrameDrops = - phConfig["disable_startup_frame_drops"].get(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.