[libcamera-devel] [PATCH v2 01/12] android: camera_device: Refuse unsupported formats

[Hirokazu Honda]

LGTM

On Sun, Sep 6, 2020 at 2:38 AM Laurent Pinchart
<laurent.pinchart at ideasonboard.com> wrote:
>
> Hi Jacopo,
>
> Thank you for the patch.
>
> On Wed, Sep 02, 2020 at 05:22:25PM +0200, Jacopo Mondi wrote:
> > The current implementation of CameraDevice::initializeStreamConfigurations()
> > fails if an image format marked as mandatory is not supported by the
> > libcamera::Camera device, but erroneously accepts non-mandatory
> > non-supported formats in the list of accepted ones.
> >
> > Fix this by ignoring non supported image formats which are not marked as
> > mandatory.
> >
> > 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>
>

Reviewed-by: Hirokazu Honda <hiroh at chromium.org>
> > ---
> >  src/android/camera_device.cpp | 14 ++++++++++----
> >  1 file changed, 10 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> > index 9605b9e9069e..ad0d7fd15d90 100644
> > --- a/src/android/camera_device.cpp
> > +++ b/src/android/camera_device.cpp
> > @@ -392,10 +392,16 @@ int CameraDevice::initializeStreamConfigurations()
> >                               break;
> >                       }
> >               }
> > -             if (camera3Format.mandatory && !mappedFormat.isValid()) {
> > -                     LOG(HAL, Error) << "Failed to map Android format "
> > -                                     << camera3Format.name << " ("
> > -                                     << utils::hex(androidFormat) << ")";
> > +
> > +             if (!mappedFormat.isValid()) {
> > +                     /* If the format is not mandatory, skip it. */
> > +                     if (!camera3Format.mandatory)
> > +                             continue;
> > +
> > +                     LOG(HAL, Error)
> > +                             << "Failed to map mandatory Android format "
> > +                             << camera3Format.name << " ("
> > +                             << utils::hex(androidFormat) << "): aborting";
> >                       return -EINVAL;
> >               }
> >
>
> --
> Regards,
>
> Laurent Pinchart
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel