[libcamera-devel] [PATCH 12/16] android: Populate streams and duration in the same loop
paul.elder at ideasonboard.com
paul.elder at ideasonboard.com
Wed Sep 1 09:24:02 CEST 2021
Hi Jacopo,
On Fri, Aug 27, 2021 at 02:07:53PM +0200, Jacopo Mondi wrote:
> The ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS and
> ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS static metadata are
> populated by looping on the streamConfigurations_ vector.
>
> Unify them in a single loop to avoid repeating it.
>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
Reviewed-by: Paul Elder <paul.elder at ideasonboard.com>
> ---
> src/android/camera_capabilities.cpp | 23 ++++++++++-------------
> 1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
> index 484242d0ad81..8bde06e824ef 100644
> --- a/src/android/camera_capabilities.cpp
> +++ b/src/android/camera_capabilities.cpp
> @@ -1255,7 +1255,9 @@ int CameraCapabilities::initializeStaticMetadata()
> maxZoom);
>
> std::vector<uint32_t> availableStreamConfigurations;
> + std::vector<int64_t> minFrameDurations;
> availableStreamConfigurations.reserve(streamConfigurations_.size() * 4);
> + minFrameDurations.reserve(streamConfigurations_.size() * 4);
> for (const auto &entry : streamConfigurations_) {
> /*
> * Filter out YUV streams not capable of running at 30 FPS.
> @@ -1272,12 +1274,19 @@ int CameraCapabilities::initializeStaticMetadata()
> if (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB && fps < 30)
> continue;
>
> + /* Stream configuration map. */
> availableStreamConfigurations.push_back(entry.androidFormat);
> availableStreamConfigurations.push_back(entry.resolution.width);
> availableStreamConfigurations.push_back(entry.resolution.height);
> availableStreamConfigurations.push_back(
> ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
>
> + /* Per-stream durations. */
> + minFrameDurations.push_back(entry.androidFormat);
> + minFrameDurations.push_back(entry.resolution.width);
> + minFrameDurations.push_back(entry.resolution.height);
> + minFrameDurations.push_back(entry.minFrameDurationNsec);
> +
> LOG(HAL, Debug)
> << "Output Stream:" << utils::hex(entry.androidFormat)
> << "(" << entry.resolution.width << "x"
> @@ -1285,22 +1294,10 @@ int CameraCapabilities::initializeStaticMetadata()
> << entry.minFrameDurationNsec << "]"
> << "@" << fps;
> }
> +
> staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
> availableStreamConfigurations);
>
> - std::vector<int64_t> minFrameDurations;
> - minFrameDurations.reserve(streamConfigurations_.size() * 4);
> - for (const auto &entry : streamConfigurations_) {
> - unsigned int fps = static_cast<unsigned int>
> - (floor(1e9 / entry.minFrameDurationNsec + 0.05f));
> - if (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB && fps < 30)
> - continue;
> -
> - minFrameDurations.push_back(entry.androidFormat);
> - minFrameDurations.push_back(entry.resolution.width);
> - minFrameDurations.push_back(entry.resolution.height);
> - minFrameDurations.push_back(entry.minFrameDurationNsec);
> - }
> staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,
> minFrameDurations);
>
> --
> 2.32.0
>
More information about the libcamera-devel
mailing list