{"id":13453,"url":"https://patchwork.libcamera.org/api/1.1/patches/13453/?format=json","web_url":"https://patchwork.libcamera.org/patch/13453/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210823131221.1034059-11-hiroh@chromium.org>","date":"2021-08-23T13:12:21","name":"[libcamera-devel,RFC,v2,10/10] libcamera: framebuffer: Add assertion to detect offset is unfilled","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8e4de434c91f89714a7278e837feab248b6de716","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13453/mbox/","series":[{"id":2386,"url":"https://patchwork.libcamera.org/api/1.1/series/2386/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2386","date":"2021-08-23T13:12:11","name":"Add offset to FrameBuffer::Plane","version":2,"mbox":"https://patchwork.libcamera.org/series/2386/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13453/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13453/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id AA5F1BD87C\n\tfor ;\n\tMon, 23 Aug 2021 13:12:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 626A9688D2;\n\tMon, 23 Aug 2021 15:12:58 +0200 (CEST)","from mail-pf1-x430.google.com (mail-pf1-x430.google.com\n\t[IPv6:2607:f8b0:4864:20::430])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E4E58688A2\n\tfor ;\n\tMon, 23 Aug 2021 15:12:56 +0200 (CEST)","by mail-pf1-x430.google.com with SMTP id t42so12751526pfg.12\n\tfor ;\n\tMon, 23 Aug 2021 06:12:56 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:184e:5d20:8fcb:dfcd])\n\tby smtp.gmail.com with ESMTPSA id\n\tj4sm18596891pgi.6.2021.08.23.06.12.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Aug 2021 06:12:53 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Zi9OgJrV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=zOZ0vNaLjlI91E9tIB7rhvpt4DtZ3fL2NQ9YL4SxK5A=;\n\tb=Zi9OgJrVjJKEW2+DKe7MbMdZq3iFSzhL5VZSr7jYkWzoDJhXt2tSMa7Nezzrps2zES\n\tVZtYqqSzP5gTvS/6QQ80xVLrYuQ8vhP3ALIjoDSve4aCXbeYD7Nq/oAFUyWanNveyJQ2\n\th8zXy6tMGDEuiq+QYsngevF5xwHo703emENVA=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=zOZ0vNaLjlI91E9tIB7rhvpt4DtZ3fL2NQ9YL4SxK5A=;\n\tb=O2ts8VHSwRi++M/GnWlghjRrMVq7tc7UFrnZILGXuMfq40LOB9LopXPeTW5dpah7+A\n\tSQnIO4+oQL2z5DugVzX2Ki63wuFTfnC2uG/Aq6PAauLnETB64h1zXPw8mVzd/EQZ0F+l\n\tykvzLOSmCoYITC1vwr/5JFtje+YT82AE2XBMM7iaCd/E3h1J/5BCHzel/kZXpU1SBEiM\n\tla4KOLA6kiZ2Byc3uTbiR1PypgUfhj9zVNThOygFmTWPlMMXZ7ciV+iLt7XIBR1duQE4\n\tXc/tw4pr5508exPhRmSBd08bw+mKObbJiyMrxG87pKfhVmfGjY4ZR0t5aqrFjl1lzceT\n\tEbDQ==","X-Gm-Message-State":"AOAM5322qxPzHpCbbxNRD8si9lLjsLa9RMiN6dWTtV+iTpTbenzjCzTl\n\tFbHZWSybFHv5SypOrLeOMlW3cSM+b61o7g==","X-Google-Smtp-Source":"ABdhPJyRkeL5U2J546bEx7XWaSYn81Vn0YBB0FjbBffgJRno8L9Ovas1Hvfh0BlzNViZgd4adR+/7A==","X-Received":"by 2002:a63:8948:: with SMTP id\n\tv69mr32128430pgd.132.1629724375275; \n\tMon, 23 Aug 2021 06:12:55 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 23 Aug 2021 22:12:21 +0900","Message-Id":"<20210823131221.1034059-11-hiroh@chromium.org>","X-Mailer":"git-send-email 2.33.0.rc2.250.ged5fa647cd-goog","In-Reply-To":"<20210823131221.1034059-1-hiroh@chromium.org>","References":"<20210823131221.1034059-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v2 10/10] libcamera: framebuffer: Add\n\tassertion to detect offset is unfilled","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The offset variable is introduced to FrameBuffer::Plane. In order to\ndetect that the plane is used while the offset is not set, this adds\nthe assertion to FrameBuffer::planes(). It should be removed in the\nfuture.\n\nSigned-off-by: Hirokazu Honda \n---\n include/libcamera/framebuffer.h | 13 +++++++++++--\n src/libcamera/framebuffer.cpp | 4 ++++\n 2 files changed, 15 insertions(+), 2 deletions(-)","diff":"diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h\nindex 5de3c744..d5aeff00 100644\n--- a/include/libcamera/framebuffer.h\n+++ b/include/libcamera/framebuffer.h\n@@ -7,6 +7,8 @@\n #ifndef __LIBCAMERA_FRAMEBUFFER_H__\n #define __LIBCAMERA_FRAMEBUFFER_H__\n \n+#include \n+#include \n #include \n #include \n \n@@ -41,14 +43,21 @@ class FrameBuffer final : public Extensible\n \n public:\n \tstruct Plane {\n+\t\tstatic constexpr unsigned int kInvalidOffset = std::numeric_limits::max();\n \t\tFileDescriptor fd;\n-\t\tunsigned int offset;\n+\t\tunsigned int offset = kInvalidOffset;\n \t\tunsigned int length;\n \t};\n \n \tFrameBuffer(const std::vector &planes, unsigned int cookie = 0);\n \n-\tconst std::vector &planes() const { return planes_; }\n+\tconst std::vector &planes() const\n+\t{\n+\t\t/* \\todo Remove the assertions after sufficient testing */\n+\t\tfor (const auto &plane : planes_)\n+\t\t\tassert(plane.offset != Plane::kInvalidOffset);\n+\t\treturn planes_;\n+\t}\n \n \tRequest *request() const;\n \tconst FrameMetadata &metadata() const { return metadata_; }\ndiff --git a/src/libcamera/framebuffer.cpp b/src/libcamera/framebuffer.cpp\nindex e9467aa0..5f612ecd 100644\n--- a/src/libcamera/framebuffer.cpp\n+++ b/src/libcamera/framebuffer.cpp\n@@ -165,6 +165,10 @@ FrameBuffer::Private::Private()\n * multiple dmabufs, based on the camera requirements.\n */\n \n+/**\n+ * \\var FrameBuffer::Plane::kInvalidOffset\n+ * \\brief The invalid offset value\n+ */\n /**\n * \\var FrameBuffer::Plane::fd\n * \\brief The dmabuf file descriptor\n","prefixes":["libcamera-devel","RFC","v2","10/10"]}