[libcamera-devel,3/4] android: camera_device: Remove scaler format information from Camera3Format
diff mbox series

Message ID 20200723173942.98182-4-niklas.soderlund@ragnatech.se
State Superseded
Headers show
Series
  • android: camera_device: Improve on format related tags
Related show

Commit Message

Niklas Söderlund July 23, 2020, 5:39 p.m. UTC 
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 <niklas.soderlund@ragnatech.se>
---
 src/android/camera_device.cpp | 6 ------
 1 file changed, 6 deletions(-)

Patch
diff mbox series 

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<Size> 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<PixelFormat> libcameraFormats;
-	camera_metadata_enum_android_scaler_available_formats_t scalerFormat;
 	const char *name;
 };
 
@@ -60,13 +57,11 @@  const std::map<int, const Camera3Format> 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<int, const Camera3Format> camera3FormatsMap = {
 		 */
 		HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, {
 			{ formats::NV12, formats::NV21 },
-			ANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED,
 			"IMPLEMENTATION_DEFINED"
 		}
 	},