[libcamera-devel] [PATCH v4 02/10] android: camera_device: Generate JPEG sizes
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Wed Sep 16 00:39:02 CEST 2020
Hi Jacopo,
Thank you for the patch.
On Sat, Sep 12, 2020 at 12:11:21PM +0200, Jacopo Mondi wrote:
> When producing the list of image resolutions to claim as supported by the
> camera HAL, the JPEG stream was assumed to be 'always valid' as, at the
> time, there was no JPEG support in place at all.
>
> With the introduction of support for JPEG compression, reporting
> non-valid sizes as supported obviously causes troubles.
>
> In order to avoid reporting non-supported resolutions as supported,
> produce the list of available JPEG sizes by using the ones supported
> by the YCbCr_420_888 format, from which the JPEG stream is encoded.
>
> Reviewed-by: Hirokazu Honda <hiroh at chromium.org>
> Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> src/android/camera_device.cpp | 40 ++++++++++++++++++++++-------------
> 1 file changed, 25 insertions(+), 15 deletions(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index ebebdac38e28..3be2dac28f9c 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -369,17 +369,21 @@ int CameraDevice::initializeStreamConfigurations()
> const std::vector<PixelFormat> &libcameraFormats =
> camera3Format.libcameraFormats;
>
> + /*
> + * JPEG is always supported, either produced directly by the
> + * camera, or encoded in the HAL.
> + */
> + if (androidFormat == HAL_PIXEL_FORMAT_BLOB) {
> + formatsMap_[androidFormat] = formats::MJPEG;
> + continue;
> + }
> +
> /*
> * Test the libcamera formats that can produce images
> * compatible with the format defined by Android.
> */
> PixelFormat mappedFormat;
> for (const PixelFormat &pixelFormat : libcameraFormats) {
> - /* \todo Fixed mapping for JPEG. */
> - if (androidFormat == HAL_PIXEL_FORMAT_BLOB) {
> - mappedFormat = formats::MJPEG;
> - break;
> - }
>
> /*
> * The stream configuration size can be adjusted,
> @@ -422,19 +426,25 @@ int CameraDevice::initializeStreamConfigurations()
> cfg.size = res;
>
> CameraConfiguration::Status status = cameraConfig->validate();
> - /*
> - * Unconditionally report we can produce JPEG.
> - *
> - * \todo The JPEG stream will be implemented as an
> - * HAL-only stream, but some cameras can produce it
> - * directly. As of now, claim support for JPEG without
> - * inspecting where the JPEG stream is produced.
> - */
> - if (androidFormat != HAL_PIXEL_FORMAT_BLOB &&
> - status != CameraConfiguration::Valid)
> + if (status != CameraConfiguration::Valid)
> continue;
>
> streamConfigurations_.push_back({ res, androidFormat });
> +
> + /*
> + * If the format is HAL_PIXEL_FORMAT_YCbCr_420_888
> + * from which JPEG is produced, add an entry for
> + * the JPEG stream.
> + *
> + * \todo Wire the JPEG encoder to query the supported
> + * sizes provided a list of formats it can encode.
> + *
> + * \todo Support JPEG streams produced by the Camera
> + * natively.
> + */
> + if (androidFormat == HAL_PIXEL_FORMAT_YCbCr_420_888)
> + streamConfigurations_.push_back(
> + { res, HAL_PIXEL_FORMAT_BLOB });
> }
> }
>
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list