From patchwork Tue Jan 24 09:22:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 18191 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 5932DBEFBE for ; Tue, 24 Jan 2023 09:22:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BBACB625E4; Tue, 24 Jan 2023 10:22:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1674552144; bh=v3c6njVfwtlIJfD0wnW9qB5Y1EDIlxfasPoKvOlB3kI=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Ru4tT6i2SO4/WsTHpx9/p1NPtOJaOMlkQwNq/eqS6DeydW45SalOkvXLU+h4E/I8p QxFogx5acqoVVenRhs9su1pEYshJZkii9/ai6gQe3plsiau4Pf7QVY+wgCH4lmgKzi wikmX9+Jr/FNc4If7/xxhgU+e8oVNn8OZKULuX22NGMinY4eWTHoSNGNc2WWbK+2p6 FI0UXs15959NzBjQa1XXfJIydHtQsp0RKHd7eSC4BlHzMC0ws2t5CeiXWnpOCs1cUc WkD1kPxQ/VYemedox+hQOaha6CFwLsDDw7e2lE/t6NySdXMfju+hwkNtkgwmq533E9 BCvsLKK8m5aSw== Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0843661EFB for ; Tue, 24 Jan 2023 10:22:23 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DLMP4yOP"; dkim-atps=neutral Received: by mail-pj1-x1035.google.com with SMTP id 88so2654182pjo.3 for ; Tue, 24 Jan 2023 01:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UGO1p7cRJGXzq3kZicwAwGHaQBMcEaXKGKPBXC3cWYw=; b=DLMP4yOPT+CM+S7q05Yl6C27/punfOyxVWjMNC0vlds5mMl9kCD9OyAj6wnBMuT+hV kL8LUgjpMP8wTzZv5nGj0kuc2juP6tGP9MsXpC+4wEBQgENu446CxfF/4qw1cDSGmR9M LaY1kK0d4+yJsRaTO6ey85TGCAe/au3oMRmNSP/RrI1y6E0LovT8w9Y56EdUrkyCCZne Om2V2cl8gVvd/w7AUPTN0FmCqz50PsCVCMFjtCayHyLGDmUQ0iVg5epZWOE1kIoXuzu1 XHcexy86nG14ncAUtEPBb2G+qyMJneOFENvFKPQ7M1x1cTQkFqufeci07soyoCzjfCQ5 NTJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UGO1p7cRJGXzq3kZicwAwGHaQBMcEaXKGKPBXC3cWYw=; b=mXZ9x8pXhpIWScUsO4VmbyoaMQx5p/Cg47eM2e9lEe+5rayPDDpNdm0O1+QxR/8A4P PTm5dvxO1EafSoQ8eZNH5f3SXbWrnPSZIriBEvsw5H/meL4qG8zaTOxZq8wCBGANsU4R zuJt+Qi6zCNTuROEG6ZuIiMED8qKN7K9Qv5URJpbbEOyZ31YJJigFcjJAaNj7CIuwjTg 3oW8FfqVW1EP6n0hdPSdxREdOmXZ9EM+VJAeNMfxvBXGBnnjn5SOZ1grG5AyQ8lr5LgI GpJRZ7QZ58WFtqWeqy5N+LnuCGYD/4vseWAqrueDAJ2MapPlT0f7Pqbu42GhQk6/BCti uHbw== X-Gm-Message-State: AFqh2kpZnvaR4sk9XFkoEsQDiB+PpIeZ2WLMVuSsPKAYcs3sxIjkrYrD /Y6UNn7Pspe8/e7VC7pg0b0k+40q/vJo+g== X-Google-Smtp-Source: AMrXdXudx4aXVIiI673iK870hzAfMbpDubRy5yE1sDXNuW6m7jD1UteEKp3zkX2SA6SjAATo528ATA== X-Received: by 2002:a17:903:11cc:b0:194:df47:2b43 with SMTP id q12-20020a17090311cc00b00194df472b43mr20754401plh.64.1674552140958; Tue, 24 Jan 2023 01:22:20 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::aee3]) by smtp.gmail.com with ESMTPSA id ja5-20020a170902efc500b001930b189b32sm1158704plb.189.2023.01.24.01.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 01:22:20 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Tue, 24 Jan 2023 01:22:18 -0800 Message-Id: <20230124092218.2266563-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] file_sink.cpp: Avoid dangling-reference 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: , X-Patchwork-Original-From: Khem Raj via libcamera-devel From: Khem Raj Reply-To: Khem Raj Cc: Khem Raj Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Fixes following errors with gcc-13 ../git/src/cam/file_sink.cpp:92:45: error: possibly dangling reference to a temporary [-Werror=dangling-reference] 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; | ^~~~ ../git/src/cam/file_sink.cpp:92:81: note: the temporary was destroyed at the end of the full expression '(& buffer->libcamera::FrameBuffer::metadata())->libcamera::FrameMetadata::planes().libcamera::Span::operator[](i)' 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; | ^ cc1plus: all warnings being treated as errors Signed-off-by: Khem Raj Reviewed-by: Eric Curtin --- src/cam/file_sink.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cam/file_sink.cpp b/src/cam/file_sink.cpp index 45213d4a..897c4b37 100644 --- a/src/cam/file_sink.cpp +++ b/src/cam/file_sink.cpp @@ -89,13 +89,13 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer) Image *image = mappedBuffers_[buffer].get(); for (unsigned int i = 0; i < buffer->planes().size(); ++i) { - const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + unsigned int bytesused = buffer->metadata().planes()[i].bytesused; Span data = image->data(i); - unsigned int length = std::min(meta.bytesused, data.size()); + unsigned int length = std::min(bytesused, data.size()); - if (meta.bytesused > data.size()) - std::cerr << "payload size " << meta.bytesused + if (bytesused > data.size()) + std::cerr << "payload size " << bytesused << " larger than plane size " << data.size() << std::endl;