From patchwork Thu Jul 23 17:39:41 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: 8941 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 7F658BD878 for ; Thu, 23 Jul 2020 17:40:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DBD8B6118D; Thu, 23 Jul 2020 19:40:52 +0200 (CEST) Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DA3966114F for ; Thu, 23 Jul 2020 19:40:49 +0200 (CEST) X-Halon-ID: a4e8b146-cd0b-11ea-933e-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id a4e8b146-cd0b-11ea-933e-005056917a89; Thu, 23 Jul 2020 19:40:48 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Thu, 23 Jul 2020 19:39:41 +0200 Message-Id: <20200723173942.98182-4-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200723173942.98182-1-niklas.soderlund@ragnatech.se> References: <20200723173942.98182-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/4] android: camera_device: Remove scaler format information from Camera3Format 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" The scaler format information was only used for the ANDROID_SCALER_AVAILABLE_FORMATS tag which is deprecated and removed. As it has no other users remove it. Signed-off-by: Niklas Söderlund --- src/android/camera_device.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 96dd8d5a99082966..d9fdaf44b2803399 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -42,13 +42,10 @@ const std::vector camera3Resolutions = { * \brief Data associated with an Android format identifier * \var libcameraFormats List of libcamera pixel formats compatible with the * Android format - * \var scalerFormat The format identifier to be reported to the android - * framework through the static format configuration map * \var name The human-readable representation of the Android format code */ struct Camera3Format { std::vector libcameraFormats; - camera_metadata_enum_android_scaler_available_formats_t scalerFormat; const char *name; }; @@ -60,13 +57,11 @@ const std::map camera3FormatsMap = { { HAL_PIXEL_FORMAT_BLOB, { { formats::MJPEG }, - ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, "BLOB" } }, { HAL_PIXEL_FORMAT_YCbCr_420_888, { { formats::NV12, formats::NV21 }, - ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888, "YCbCr_420_888" } }, { @@ -76,7 +71,6 @@ const std::map camera3FormatsMap = { */ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, { { formats::NV12, formats::NV21 }, - ANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED, "IMPLEMENTATION_DEFINED" } },