From patchwork Fri May 17 23:06:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1229 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BBE1D6186B for ; Sat, 18 May 2019 01:06:46 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5A2E7336 for ; Sat, 18 May 2019 01:06:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1558134406; bh=rR4ehpcqEikhcJyaY1PU1JMA7xCXc9+aH8pRz9tJQa8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hJqjRK6kAL2YvsmGar9l0YU02QApQ0uEuIdNltTDyBROTo2AqY7sennSfqeVwPmw+ dW7rawG8riL46vfngEpIni3OU0QE+mG6/WS3UmsaHBB4W8smEMRvOTY5N3t9iLKhPz clQeuy8p3GF0lf7iiYa552Rhu0PHGrVEjGPu1W2c= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 18 May 2019 02:06:21 +0300 Message-Id: <20190517230621.24668-13-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517230621.24668-1-laurent.pinchart@ideasonboard.com> References: <20190517230621.24668-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH/RFC 12/12] cam: Validate camera configuration X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2019 23:06:49 -0000 From: Niklas Söderlund Use CameraConfiguration::validate() to validate and possibly update the stream formats before configuring a camera. Signed-off-by: Niklas Söderlund --- src/cam/main.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index a962f94c8f59..91785b7fea31 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -140,6 +140,18 @@ static CameraConfiguration *prepareCameraConfig() cfg.pixelFormat = conf["pixelformat"]; } + switch (config->validate()) { + case CameraConfiguration::Valid: + break; + case CameraConfiguration::Adjusted: + std::cout << "Adjusted request format" << std::endl; + break; + case CameraConfiguration::Invalid: + delete config; + config = nullptr; + break; + } + return config; }