Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 00:19:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_device: Remove scaler format information from Camera3Format

Browse source 
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>
This commit is contained in:
Niklas Söderlund 2020-07-23 18:36:02 +02:00
parent 142a9ee3f8
commit 3312af649a
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/android/camera_device.cpp
View file

@ -42,13 +42,10 @@ const std::vector<Size> camera3Resolutions = {
* \brief Data associated with an Android format identifier * \brief Data associated with an Android format identifier
* \var libcameraFormats List of libcamera pixel formats compatible with the * \var libcameraFormats List of libcamera pixel formats compatible with the
* Android format * 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 * \var name The human-readable representation of the Android format code
*/ */
struct Camera3Format { struct Camera3Format {
std::vector<PixelFormat> libcameraFormats; std::vector<PixelFormat> libcameraFormats;
camera_metadata_enum_android_scaler_available_formats_t scalerFormat;
const char *name; const char *name;
}; };
@ -60,13 +57,11 @@ const std::map<int, const Camera3Format> camera3FormatsMap = {
{ {
HAL_PIXEL_FORMAT_BLOB, { HAL_PIXEL_FORMAT_BLOB, {
{ formats::MJPEG }, { formats::MJPEG },
ANDROID_SCALER_AVAILABLE_FORMATS_BLOB,
"BLOB" "BLOB"
} }
}, { }, {
HAL_PIXEL_FORMAT_YCbCr_420_888, { HAL_PIXEL_FORMAT_YCbCr_420_888, {
{ formats::NV12, formats::NV21 }, { formats::NV12, formats::NV21 },
ANDROID_SCALER_AVAILABLE_FORMATS_YCbCr_420_888,
"YCbCr_420_888" "YCbCr_420_888"
} }
}, { }, {
@ -76,7 +71,6 @@ const std::map<int, const Camera3Format> camera3FormatsMap = {
*/ */
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, {
{ formats::NV12, formats::NV21 }, { formats::NV12, formats::NV21 },
ANDROID_SCALER_AVAILABLE_FORMATS_IMPLEMENTATION_DEFINED,
"IMPLEMENTATION_DEFINED" "IMPLEMENTATION_DEFINED"
} }
}, },