From patchwork Wed Sep 23 16:44:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9762 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 4C901C3B5B for ; Wed, 23 Sep 2020 16:44:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4396762FEC; Wed, 23 Sep 2020 18:44:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iXBpOdqj"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2F7D260576 for ; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A1A0B9CE; Wed, 23 Sep 2020 18:44:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600879456; bh=TpUIUoyashbCHjlPkpSkw+WM8CONmgNXCMsFjxEzyPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXBpOdqjpnLG33G0I5otK7VGfeXD7dDoEGbhuMjpBeUL1S5N6bt4CFyw9YneBwFPF QZbn+sGtJmZf+luFKSjqElgzuHTGeilm4qTwS2MBUcIkY0kUr/DCX8Y0rtTtQWekm4 68SHCVYGAFbqtKXBHKsFTSC387Q3EBD0bHhe5GGc= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 17:44:09 +0100 Message-Id: <20200923164412.319079-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> References: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/4] simple-cam: Use the new BufferMap interface 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: Erkan Diken Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The Request object has been updated to specify a BufferMap type. Utilise it. Reported-by: Erkan Diken Signed-off-by: Kieran Bingham --- simple-cam.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-cam.cpp b/simple-cam.cpp index 56aed7564dad..e2ac122546ce 100644 --- a/simple-cam.cpp +++ b/simple-cam.cpp @@ -28,7 +28,7 @@ static void requestComplete(Request *request) if (request->status() == Request::RequestCancelled) return; - const std::map &buffers = request->buffers(); + const Request::BufferMap &buffers = request->buffers(); for (auto bufferPair : buffers) { // (Unused) Stream *stream = bufferPair.first; From patchwork Wed Sep 23 16:44:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9763 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 C544BC3B5B for ; Wed, 23 Sep 2020 16:44:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1C77062FE8; Wed, 23 Sep 2020 18:44:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Yg7C/3K3"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F7A960576 for ; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0DC49DC4; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600879457; bh=gsttiJJ+appO/ORcxGY54L/6k6PAXEtjaNa6kS+Ff1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yg7C/3K3Xm0TT8zySeBcRoNrsAcQ2P681iHt3YGc6TmWrMlwjLrXjzP+lrKC6o3gK FupY+UF/frMeZ7lLE0bgI2hEbwE7e9rA0BOodlSNbsdgpNu3d/3k3+EntwjwGiQk/y BV/g/Uz3tamjDS9NZbh/DuQFd8rJn4FSM2sZCBhM= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 17:44:10 +0100 Message-Id: <20200923164412.319079-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> References: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/4] simple-cam: Use a const stream 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: Erkan Diken Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The API was updated to ensure the Stream pointer referenced from the BufferMap is const. Update accordingly. Reported-by: Erkan Diken Signed-off-by: Kieran Bingham --- simple-cam.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-cam.cpp b/simple-cam.cpp index e2ac122546ce..3aa975e14f48 100644 --- a/simple-cam.cpp +++ b/simple-cam.cpp @@ -70,7 +70,7 @@ static void requestComplete(Request *request) for (auto it = buffers.begin(); it != buffers.end(); ++it) { - Stream *stream = it->first; + const Stream *stream = it->first; FrameBuffer *buffer = it->second; request->addBuffer(stream, buffer); From patchwork Wed Sep 23 16:44:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9764 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 9A36EC3B5B for ; Wed, 23 Sep 2020 16:44:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6792F62FF4; Wed, 23 Sep 2020 18:44:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="he6a11rf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DA56062FDE for ; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D40A1226; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600879457; bh=4b627WI5pkebGJbX7C7vvpy7cKrrIvi62XuB2hdQTb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=he6a11rfARw7sBl/66wW5dquUOU3pxKw1xtZbIBjVNLjJrrVF1OdSA/GJVofef0C2 kE/4NyKwi5nzYLhAJZpZP/DULE4Qwozfjibws8+vdQsQJYSCTKNmz0KETwRljo4qGV uD0tAFIGewyg3EM1wxhgBn6M3aEGVzmGhMQ9Ohag= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 17:44:11 +0100 Message-Id: <20200923164412.319079-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> References: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/4] meson: Remove incorrect default 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" The -Wno-unused-parameter is not a meson default option. Remove it. Signed-off-by: Kieran Bingham --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index fe52af772713..6ca80ea7f29b 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,6 @@ project('simple-cam', 'c', 'cpp', default_options : [ 'werror=true', - '-Wno-unused-parameter=true', 'warning_level=2', 'cpp_std=c++14', ]) From patchwork Wed Sep 23 16:44:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9765 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 0BAABC3B5B for ; Wed, 23 Sep 2020 16:44:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CC0D162FE6; Wed, 23 Sep 2020 18:44:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="trqBg4we"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 42D3B62FE8 for ; Wed, 23 Sep 2020 18:44:18 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C6D6F1243; Wed, 23 Sep 2020 18:44:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600879458; bh=dZYjMKzLlc0NJdQEe7lkEYGcp5OBBpFF5dCrAnZQp5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=trqBg4weBk+NDownJN1sSJlVF8lDC6HlXnbx0wNfZAH156Sdlrcxn1md15vp38Jxg BYGY3paIuKcLhzo3VR9Dt3lQSZi5lSWIzvkPFu1sRKF7+rjtkEOs/T21F3DCZtuZYX DxdpqoEPsp855HrsIppePciqUaWTwDpkG2H5Nhpg= From: Kieran Bingham To: libcamera devel Date: Wed, 23 Sep 2020 17:44:12 +0100 Message-Id: <20200923164412.319079-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> References: <20200923164412.319079-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/4] meson: Update to C++17 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" libcamera has moved to using functionality from C++17. Increase the standard used. Signed-off-by: Kieran Bingham --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6ca80ea7f29b..c312f2c99dc5 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('simple-cam', 'c', 'cpp', default_options : [ 'werror=true', 'warning_level=2', - 'cpp_std=c++14', + 'cpp_std=c++17', ]) # simple-cam.cpp is the fully commented application