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

android: camera_device: Do not default pixel array properties

Browse source 
Now that the pixel array properties have been defaulted in the
CameraSensor class (or in the pipeline handler, for the UVC use case),
they will always be reported by the libcamera::Camera and there's no
need to default them in the Camera HAL.

Remove defaults and assume properties are always there.

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-12-30 17:18:51 +01:00
parent db6a3bfa6e
commit cda41ff754
1 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/android/camera_device.cpp
View file

@ -851,7 +851,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
staticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);
/* Sensor static metadata. */
if (properties.contains(properties::PixelArraySize)) {
{
const Size &size =
properties.get(properties::PixelArraySize);
std::vector<int32_t> data{
@ -860,17 +860,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
};
staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,
data.data(), data.size());
} else {
/*
* \todo Drop the default once the ov5670 and ov13858 drivers
* are updated to report the pixel array size.
*/
int32_t data[] = { 2592, 1944 };
staticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,
data, 2);
}
if (properties.contains(properties::PixelArrayActiveAreas)) {
{
const Span<const Rectangle> &rects =
properties.get(properties::PixelArrayActiveAreas);
std::vector<int32_t> data{
@ -881,14 +873,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
};
staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,
data.data(), data.size());
} else {
/*
* \todo Drop the default once the ov5670 and ov13858 drivers
* are updated to report the pixel array size.
*/
int32_t data[] = { 0, 0, 2560, 1920 };
staticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,
data, 4);
}
int32_t sensitivityRange[] = {