[libcamera-devel] [PATCH v2 07/12] android: camera_device: Get rid of stream counter
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Sat Sep 5 23:37:39 CEST 2020
Hi Jacopo,
Thank you for the patch.
On Wed, Sep 02, 2020 at 05:22:31PM +0200, Jacopo Mondi wrote:
> Now that CameraConfiguration::addConfiguration() returns the index
> of the newly added configuration, there's no need to use a custom
> counter to keep track of the StreamConfiguration index associated with
> a CameraStream.
>
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
> ---
> src/android/camera_device.cpp | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index b110bfe43ece..ace7f6b17b4a 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1195,12 +1195,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
> streams_.clear();
> streams_.reserve(stream_list->num_streams);
>
> - /*
> - * Track actually created streams, as there may not be a 1:1 mapping of
> - * camera3 streams to libcamera streams.
> - */
> - unsigned int streamIndex = 0;
> -
> /* First handle all non-MJPEG streams. */
> for (unsigned int i = 0; i < stream_list->num_streams; ++i) {
> camera3_stream_t *stream = stream_list->streams[i];
> @@ -1230,9 +1224,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
> streamConfiguration.size = size;
> streamConfiguration.pixelFormat = format;
>
> - config_->addConfiguration(streamConfiguration);
> -
> - streams_[i].index = streamIndex++;
> + streams_[i].index = config_->addConfiguration(streamConfiguration);
As explained in the review of 06/12, this could also be
config_->addConfiguration(streamConfiguration);
streams_[i].index = config_->size() - 1;
In any case,
Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> }
>
> /* Now handle MJPEG streams, adding a new stream if required. */
> @@ -1280,8 +1272,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
> LOG(HAL, Info) << "Adding " << streamConfiguration.toString()
> << " for MJPEG support";
>
> - config_->addConfiguration(streamConfiguration);
> - streams_[i].index = streamIndex++;
> + streams_[i].index = config_->addConfiguration(streamConfiguration);
> }
> }
>
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list