From patchwork Mon Jan 22 13:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elias Naur X-Patchwork-Id: 19446 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 BD5B8BDB1C for ; Mon, 22 Jan 2024 13:33:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id ECA8D6291F; Mon, 22 Jan 2024 14:33:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=eliasnaur.com header.i=@eliasnaur.com header.b="4Xnu3kIW"; dkim-atps=neutral Received: from mail-vs1-xe34.google.com (mail-vs1-xe34.google.com [IPv6:2607:f8b0:4864:20::e34]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1040961D30 for ; Mon, 22 Jan 2024 14:33:43 +0100 (CET) Received: by mail-vs1-xe34.google.com with SMTP id ada2fe7eead31-466f6d4b6d3so660373137.3 for ; Mon, 22 Jan 2024 05:33:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eliasnaur.com; s=google; t=1705930421; x=1706535221; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=R8SLgnbeiiqr8ZOq4nAIiXN9U6HpgoAHIsfxrYGfAaE=; b=4Xnu3kIWrZP50Lo+3zDkSnrR+UIGu8A+s0IsH93KzJREDUnm5gYp9hvDfJ74YwPQim S1RdYYfjYsqGIReAFpZzd53z5ry3NBEEnn0oScTBKUgYUJ1zpyzvZnxshrEGSLqZSEMA UZ93X8b8cO1mGvDD2pZ5rdhmtjV5EKj04RuXrkUnfV+ZekNIOfUhyvQS8cH1RhNtx3WR 0HWwgyGSzXanr0SZHFvHYd8hAzqnVKeI3byu+nYSnEhITqgPSsGf1RulAPso5jbUXmWa Tz+p4Y55YsriMbi6i7mhpgoEwbHf70g6YeDBYPJ65Qs+f3QUIqN0VVYolaVFUkaWR6hS xfPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705930421; x=1706535221; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R8SLgnbeiiqr8ZOq4nAIiXN9U6HpgoAHIsfxrYGfAaE=; b=CV7rHOd+Cw3vaXsdDjZC4xBLFFtSHiJsTA6/B1GpP0cf7PW24FZ8EiG8RpjdL8FAd/ sp3ffjs+0UoIsCdBAg5lxlyz20PaGEYBRp+SYzgTi5nowFXuzZfz6qjFn07uPW14PFzj UAjWDZ++Br6TGVB/2pvJHuMbQWv1EFMzJiBPPzmj+X6APCfoDTFM3vaBaiyhJZx19251 wATOocwOqVIzdV4/kXJy0t8uNp/+YtDR7SB8ynsIo5qnpwrjvTrfAe2DYtc/tdyzbz0V O7RJW2xcXLx/d5DCLE6wREf7gHU1BbnLhAAVXyVGxCFy9UfxL9DGNDWNO6mTpBPAFops FvZA== X-Gm-Message-State: AOJu0Yw2Vw0WCv30D4rVRNRiCnexUeY9KWBBhKhaXVK+2oGZvqCJUDA9 83+NIMp2r18Nrds9tSUPQRzySLAc+OfA3WDcB5YBaMIXUq1hH4tFYiDixiI6U34NX4ItfdWabBE PlA== X-Google-Smtp-Source: AGHT+IF+NUQ+AygmSstH3It4J9aL9dA4P+dVQQGHXGRnaDVrvL5gHvCv6UwucLvAKKUBSOXEdAKM1w== X-Received: by 2002:a67:efd7:0:b0:46a:601e:ff57 with SMTP id s23-20020a67efd7000000b0046a601eff57mr194509vsp.5.1705930421563; Mon, 22 Jan 2024 05:33:41 -0800 (PST) Received: from localhost.localdomain ([189.174.206.139]) by smtp.gmail.com with ESMTPSA id e27-20020a0561020f9b00b004698691d31bsm1177306vsv.30.2024.01.22.05.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 05:33:40 -0800 (PST) From: Elias Naur To: libcamera-devel@lists.libcamera.org Subject: [PATCH v2] pipeline: rpi: always initialize the embedded buffer in tryRunPipeline Date: Mon, 22 Jan 2024 08:33:10 -0500 Message-ID: <20240122133332.64190-1-mail@eliasnaur.com> X-Mailer: git-send-email 2.43.0 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: , Cc: Elias Naur Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Vc4CameraData::findMatchBuffers may return successfully with a null embedded buffer, in which case the embedded buffer id would be left uninitialized. Without this change, libcamera v0.2.0 usually crashes for me with an assertion error: ipa_base.cpp:397 assertion "it != buffers_.end()" failed in prepareIsp() Signed-off-by: Elias Naur Reviewed-by: Laurent Pinchart Reviewed-by: Naushir Patuck --- src/libcamera/pipeline/rpi/vc4/vc4.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp index 26102ea7..a52f0e7a 100644 --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp @@ -945,6 +945,7 @@ void Vc4CameraData::tryRunPipeline() params.requestControls = request->controls(); params.ipaContext = request->sequence(); params.delayContext = bayerFrame.delayContext; + params.buffers.embedded = 0; if (embeddedBuffer) { unsigned int embeddedId = unicam_[Unicam::Embedded].getBufferId(embeddedBuffer);