summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-07-23 18:36:02 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-07-24 19:03:52 +0200
commit3312af649a28607f6718afdbd819aa5b70e11891 (patch)
tree02925588b1985ea5bae09dcad55f2d068fecb336 /src
parent142a9ee3f87726a8842a32bc132ca4a11d750a9e (diff)
android: camera_device: Remove scaler format information from Camera3Format
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> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/android/camera_device.cpp6
1 files changed, 0 insertions, 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<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"
}
},