From 3312af649a28607f6718afdbd819aa5b70e11891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Thu, 23 Jul 2020 18:36:02 +0200 Subject: android: camera_device: Remove scaler format information from Camera3Format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- 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 96dd8d5a..d9fdaf44 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" } }, -- cgit v1.2.1