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

android: camera_device: Remove ANDROID_SCALER_AVAILABLE_FORMATS

Browse source 
According to the documentation the tag
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS deprecates the
ANDROID_SCALER_AVAILABLE_FORMATS tag. As the HAL implements both tags
remove the deprecated one.

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:25:04 +02:00
parent 7145d15e04
commit 3530614fbf
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/android/camera_device.cpp
View file

@ -376,7 +376,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
* \todo Keep this in sync with the actual number of entries. * \todo Keep this in sync with the actual number of entries.
* Currently: 50 entries, 647 bytes of static metadata * Currently: 50 entries, 647 bytes of static metadata
*/ */
uint32_t numEntries = 50; uint32_t numEntries = 49;
uint32_t byteSize = 647; uint32_t byteSize = 647;
/* /*
@ -385,10 +385,9 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
* *
* Each stream configuration entry requires 52 bytes: * Each stream configuration entry requires 52 bytes:
* 4 32bits integers for ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS * 4 32bits integers for ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS
* 1 32bits integer for ANDROID_SCALER_AVAILABLE_FORMATS
* 4 64bits integers for ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS * 4 64bits integers for ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS
*/ */
byteSize += streamConfigurations_.size() * 52; byteSize += streamConfigurations_.size() * 48;
return std::make_tuple(numEntries, byteSize); return std::make_tuple(numEntries, byteSize);
} }
@ -656,15 +655,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,
&maxDigitalZoom, 1); &maxDigitalZoom, 1);
std::vector<uint32_t> availableStreamFormats;
availableStreamFormats.reserve(streamConfigurations_.size());
std::transform(streamConfigurations_.begin(), streamConfigurations_.end(),
std::back_inserter(availableStreamFormats),
[](const auto &entry) { return entry.androidScalerCode; });
staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_FORMATS,
availableStreamFormats.data(),
availableStreamFormats.size());
std::vector<uint32_t> availableStreamConfigurations; std::vector<uint32_t> availableStreamConfigurations;
availableStreamConfigurations.reserve(streamConfigurations_.size() * 4); availableStreamConfigurations.reserve(streamConfigurations_.size() * 4);
for (const auto &entry : streamConfigurations_) { for (const auto &entry : streamConfigurations_) {
@ -761,7 +751,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE, ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,
ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,
ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,
ANDROID_SCALER_AVAILABLE_FORMATS,
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
ANDROID_SCALER_AVAILABLE_STALL_DURATIONS, ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,
ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,