From patchwork Thu Jun 17 04:57:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12625 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 43071BD78E for ; Thu, 17 Jun 2021 04:57:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B76816893F; Thu, 17 Jun 2021 06:57:32 +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="jDVA3v6I"; 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 57F7F60296 for ; Thu, 17 Jun 2021 06:57:31 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A9A3AE53; Thu, 17 Jun 2021 06:57:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1623905850; bh=mpn45AkillXMmM+EYzsiws2WVoO9EeZAB1lB92wRlJk=; h=From:To:Cc:Subject:Date:From; b=jDVA3v6IgsSWf89b7TBE7RhWv5sfnxTUPD5MPfcPlrmhd2hK8pPACl5hTs5b+UJ+d GkkayAKeq/sOtRJjIV0HtE/0QEjyZcFneJ+ynm6oH9x4SEvsfdRwd5XTzY21NlXk5c ecwWJ+y4F2Uaat918r1bmpQEDeXPp/tvy7cA6QRY= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 17 Jun 2021 13:57:13 +0900 Message-Id: <20210617045713.1432573-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: camera_device: Simplify leftover CameraMetadata calls 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" There were some CameraMetadata calls that were left in the old version. Update them. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- src/android/camera_device.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index b8df7817..11d5c21b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -931,7 +931,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() { 0, 1 } }; staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP, - aeCompensationStep, 1); + aeCompensationStep); std::vector availableAfModes = { ANDROID_CONTROL_AF_MODE_OFF, @@ -1153,7 +1153,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() /* Statistics static metadata. */ uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF; staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES, - &faceDetectMode, 1); + faceDetectMode); int32_t maxFaceCount = 0; staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT, @@ -1273,8 +1273,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT); } staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, - availableStreamConfigurations.data(), - availableStreamConfigurations.size()); + availableStreamConfigurations); std::vector availableStallDurations = { ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,