From patchwork Tue Jul 28 18:55:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 9045 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 5F21ABD86F for ; Tue, 28 Jul 2020 18:56:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 351FF611A2; Tue, 28 Jul 2020 20:56:10 +0200 (CEST) Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7327060923 for ; Tue, 28 Jul 2020 20:56:07 +0200 (CEST) X-Halon-ID: fdd9785b-d103-11ea-8fb8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id fdd9785b-d103-11ea-8fb8-005056917f90; Tue, 28 Jul 2020 20:56:06 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Tue, 28 Jul 2020 20:55:46 +0200 Message-Id: <20200728185548.3361465-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200728185548.3361465-1-niklas.soderlund@ragnatech.se> References: <20200728185548.3361465-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] android: camera_device: Skip instead of fail if camera don't support format 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" If the libcamera Camera don't support the Android format do not fail the initialization. Instead skip adding the Android format to the list of supported formats reported. This allows extending the camera3FormatsMap with Android formats not supported by all libcamera Cameras and probe and report only the ones that overlap. Signed-off-by: Niklas Söderlund --- src/android/camera_device.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index b49d6681e5a52d32..265627a98422bd67 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -282,10 +282,10 @@ int CameraDevice::initializeStreamConfigurations() } } if (!mappedFormat.isValid()) { - LOG(HAL, Error) << "Failed to map Android format " + LOG(HAL, Debug) << "Failed to map Android format " << camera3Format.name << " (" << utils::hex(androidFormat) << ")"; - return -EINVAL; + continue; } /*