From patchwork Mon Feb 15 10:11:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11297 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 DC569BD162 for ; Mon, 15 Feb 2021 10:12:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AB216637BF; Mon, 15 Feb 2021 11:12:21 +0100 (CET) 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="XwnxwPep"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B6166375F for ; Mon, 15 Feb 2021 11:12:20 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E7A0A743; Mon, 15 Feb 2021 11:12:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1613383940; bh=Sop2kqB8sDHrMsH4tqyNKwgLSxVC8Yg/QD8dAbMVcJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XwnxwPepY2PwpoJv0qoW/sdCE+mwVcPK5Lqnl5t0qSmPGaxsvaIMtIVOXMPr7Uba2 uayQqxPE8jRMJmO60viTkjakARBpY3BUvWPSVH0G87Tbxg0vX3TMEDbvuIIlfv/wNx o2xo6coekbiZOz2jFQEpG5w/MmUkEZ4G90ixiK6U= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Mon, 15 Feb 2021 19:11:59 +0900 Message-Id: <20210215101200.149457-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210215101200.149457-1-paul.elder@ideasonboard.com> References: <20210215101200.149457-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] android: camera_device: Default the camera location to Front 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" Since the libcamera camera now has an Unknown location, we can know if the camera's location is actually unknown. In this case, set the android camera location to front, as some systems may not support external cameras. This allows the following CTS test to pass: - android.hardware.camera2.cts.CameraManagerTest#testCameraManagerGetDeviceIdList Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- Changes in v3: - print warning when defaulting to front from unknown location No change in v2 --- src/android/camera_device.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 1e2a5b5f..a4447c16 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -407,6 +407,11 @@ int CameraDevice::initialize() case properties::CameraLocationExternal: facing_ = CAMERA_FACING_EXTERNAL; break; + case properties::CameraLocationUnknown: + LOG(HAL, Warning) + << "Unknown camera location, defaulting to front"; + facing_ = CAMERA_FACING_FRONT; + break; } }