From patchwork Mon Dec 16 15:40:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 22352 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 0CBC1C32F6 for ; Mon, 16 Dec 2024 15:42:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 736FB67F81; Mon, 16 Dec 2024 16:42:06 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iwrSbliX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E83B67F79 for ; Mon, 16 Dec 2024 16:42:03 +0100 (CET) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:bfdf:3a3c:e45:66e3]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 42F7B675; Mon, 16 Dec 2024 16:41:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1734363687; bh=OHbDWZzgC0bwMfQ1fIsCR9z8ra9VisRmR4TaKweDCr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iwrSbliXCcA/kodFCI/R7xt2RxtIZpjZ+Hhvlui5v7AsqswfT9Ys61T1awE2tutkB 2ogWb4qfFrXxda2cyQuFPQMMkpOx7DFpg3s78mSbrFZMrzh/jjd1A5UwA1EtrKpsfe 8A2uG1yecKr5Q+2MRgEcWH6dAu/th2HDKnHuAlOg= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v4 06/20] libcamera: converter_v4l2_m2m: Add missing override specifier Date: Mon, 16 Dec 2024 16:40:46 +0100 Message-ID: <20241216154124.203650-7-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241216154124.203650-1-stefan.klug@ideasonboard.com> References: <20241216154124.203650-1-stefan.klug@ideasonboard.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" In preparation to adding new functions and overrides to the V4L2M2MDevice class add an override specifier to all overridden functions in the class. This prevents -Winconsistent-missing-override warnings. Signed-off-by: Stefan Klug Reviewed-by: Jacopo Mondi Reviewed-by: Paul Elder --- Changes in v4: - Added this patch --- .../internal/converter/converter_v4l2_m2m.h | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h index 0bc0d053e2c4..9b8e43ff0b91 100644 --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h @@ -38,28 +38,29 @@ class V4L2M2MConverter : public Converter public: V4L2M2MConverter(MediaDevice *media); - int loadConfiguration([[maybe_unused]] const std::string &filename) { return 0; } - bool isValid() const { return m2m_ != nullptr; } + int loadConfiguration([[maybe_unused]] const std::string &filename) override { return 0; } + bool isValid() const override { return m2m_ != nullptr; } - std::vector formats(PixelFormat input); - SizeRange sizes(const Size &input); + std::vector formats(PixelFormat input) override; + SizeRange sizes(const Size &input) override; std::tuple - strideAndFrameSize(const PixelFormat &pixelFormat, const Size &size); + strideAndFrameSize(const PixelFormat &pixelFormat, const Size &size) override; int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfg); + const std::vector> + &outputCfg) override; int exportBuffers(const Stream *stream, unsigned int count, - std::vector> *buffers); + std::vector> *buffers) override; - int start(); - void stop(); + int start() override; + void stop() override; int queueBuffers(FrameBuffer *input, - const std::map &outputs); + const std::map &outputs) override; - int setInputCrop(const Stream *stream, Rectangle *rect); - std::pair inputCropBounds(const Stream *stream); + int setInputCrop(const Stream *stream, Rectangle *rect) override; + std::pair inputCropBounds(const Stream *stream) override; private: class V4L2M2MStream : protected Loggable