[libcamera-devel] [PATCH v4 05/10] libcamera: bayer_format: Rework BayerFormat conversion table
Naushir Patuck
naush at raspberrypi.com
Thu Oct 28 14:40:38 CEST 2021
Hi Kieran,
Thank you for your feedback.
On Thu, 28 Oct 2021 at 13:37, Kieran Bingham <
kieran.bingham at ideasonboard.com> wrote:
> Quoting Naushir Patuck (2021-10-28 09:46:41)
> > Rename the bayerToV4l2 conversion table to bayerToFormat. Update the
> table to
> > hold both the PixelFormat and V4L2PixelFormat conversions for a given
> > BayerFormat. This will allow converting between BayerFormat and
> PixelFormat
> > types in a subsequent change.
> >
> > Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
> > ---
> > src/libcamera/bayer_format.cpp | 112 ++++++++++++++++++++++-----------
> > 1 file changed, 75 insertions(+), 37 deletions(-)
> >
> > diff --git a/src/libcamera/bayer_format.cpp
> b/src/libcamera/bayer_format.cpp
> > index 1c1e849a7e31..8665a025f7e0 100644
> > --- a/src/libcamera/bayer_format.cpp
> > +++ b/src/libcamera/bayer_format.cpp
> > @@ -13,6 +13,7 @@
> >
> > #include <linux/media-bus-format.h>
> >
> > +#include <libcamera/formats.h>
> > #include <libcamera/transform.h>
> >
> > /**
> > @@ -84,37 +85,74 @@ struct BayerFormatComparator {
> > }
> > };
> >
> > -const std::map<BayerFormat, V4L2PixelFormat, BayerFormatComparator>
> bayerToV4l2{
> > - { { BayerFormat::BGGR, 8, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8) },
> > - { { BayerFormat::GBRG, 8, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8) },
> > - { { BayerFormat::GRBG, 8, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8) },
> > - { { BayerFormat::RGGB, 8, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8) },
> > - { { BayerFormat::BGGR, 10, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) },
> > - { { BayerFormat::GBRG, 10, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) },
> > - { { BayerFormat::GRBG, 10, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) },
> > - { { BayerFormat::RGGB, 10, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) },
> > - { { BayerFormat::BGGR, 10, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) },
> > - { { BayerFormat::GBRG, 10, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) },
> > - { { BayerFormat::GRBG, 10, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) },
> > - { { BayerFormat::RGGB, 10, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) },
> > - { { BayerFormat::BGGR, 10, BayerFormat::Packing::IPU3 },
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10) },
> > - { { BayerFormat::GBRG, 10, BayerFormat::Packing::IPU3 },
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10) },
> > - { { BayerFormat::GRBG, 10, BayerFormat::Packing::IPU3 },
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10) },
> > - { { BayerFormat::RGGB, 10, BayerFormat::Packing::IPU3 },
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10) },
> > - { { BayerFormat::BGGR, 12, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) },
> > - { { BayerFormat::GBRG, 12, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) },
> > - { { BayerFormat::GRBG, 12, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) },
> > - { { BayerFormat::RGGB, 12, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) },
> > - { { BayerFormat::BGGR, 12, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) },
> > - { { BayerFormat::GBRG, 12, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) },
> > - { { BayerFormat::GRBG, 12, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) },
> > - { { BayerFormat::RGGB, 12, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) },
> > - { { BayerFormat::BGGR, 16, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) },
> > - { { BayerFormat::GBRG, 16, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) },
> > - { { BayerFormat::GRBG, 16, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) },
> > - { { BayerFormat::RGGB, 16, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) },
> > - { { BayerFormat::MONO, 8, BayerFormat::Packing::None },
> V4L2PixelFormat(V4L2_PIX_FMT_GREY) },
> > - { { BayerFormat::MONO, 10, BayerFormat::Packing::CSI2 },
> V4L2PixelFormat(V4L2_PIX_FMT_Y10P) },
> > +struct Formats {
> > + PixelFormat pixelFormat;
> > + V4L2PixelFormat v4l2Format;
> > +};
> > +
> > +const std::map<BayerFormat, Formats, BayerFormatComparator>
> bayerToFormat{
> > + { { BayerFormat::BGGR, 8, BayerFormat::Packing::None },
> > + { formats::SBGGR8, V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8)
> } },
> > + { { BayerFormat::GBRG, 8, BayerFormat::Packing::None },
> > + { formats::SGBRG8, V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8)
> } },
> > + { { BayerFormat::GRBG, 8, BayerFormat::Packing::None },
> > + { formats::SGRBG8, V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8)
> } },
> > + { { BayerFormat::RGGB, 8, BayerFormat::Packing::None },
> > + { formats::SRGGB8, V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8)
> } },
> > + { { BayerFormat::BGGR, 10, BayerFormat::Packing::None },
> > + { formats::SBGGR10,
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10) } },
> > + { { BayerFormat::GBRG, 10, BayerFormat::Packing::None },
> > + { formats::SGBRG10,
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10) } },
> > + { { BayerFormat::GRBG, 10, BayerFormat::Packing::None },
> > + { formats::SGRBG10,
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10) } },
> > + { { BayerFormat::RGGB, 10, BayerFormat::Packing::None },
> > + { formats::SRGGB10,
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10) } },
> > + { { BayerFormat::BGGR, 10, BayerFormat::Packing::CSI2 },
> > + { formats::SBGGR10_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P) } },
> > + { { BayerFormat::GBRG, 10, BayerFormat::Packing::CSI2 },
> > + { formats::SGBRG10_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P) } },
> > + { { BayerFormat::GRBG, 10, BayerFormat::Packing::CSI2 },
> > + { formats::SGRBG10_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P) } },
> > + { { BayerFormat::RGGB, 10, BayerFormat::Packing::CSI2 },
> > + { formats::SRGGB10_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P) } },
> > + { { BayerFormat::BGGR, 10, BayerFormat::Packing::IPU3 },
> > + { formats::SBGGR10_IPU3,
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10) } },
> > + { { BayerFormat::GBRG, 10, BayerFormat::Packing::IPU3 },
> > + { formats::SGBRG10_IPU3,
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10) } },
> > + { { BayerFormat::GRBG, 10, BayerFormat::Packing::IPU3 },
> > + { formats::SGRBG10_IPU3,
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10) } },
> > + { { BayerFormat::RGGB, 10, BayerFormat::Packing::IPU3 },
> > + { formats::SRGGB10_IPU3,
> V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10) } },
> > + { { BayerFormat::BGGR, 12, BayerFormat::Packing::None },
> > + { formats::SBGGR12,
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12) } },
> > + { { BayerFormat::GBRG, 12, BayerFormat::Packing::None },
> > + { formats::SGBRG12,
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12) } },
> > + { { BayerFormat::GRBG, 12, BayerFormat::Packing::None },
> > + { formats::SGRBG12,
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12) } },
> > + { { BayerFormat::RGGB, 12, BayerFormat::Packing::None },
> > + { formats::SRGGB12,
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12) } },
> > + { { BayerFormat::BGGR, 12, BayerFormat::Packing::CSI2 },
> > + { formats::SBGGR12_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P) } },
> > + { { BayerFormat::GBRG, 12, BayerFormat::Packing::CSI2 },
> > + { formats::SGBRG12_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P) } },
> > + { { BayerFormat::GRBG, 12, BayerFormat::Packing::CSI2 },
> > + { formats::SGRBG12_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P) } },
> > + { { BayerFormat::RGGB, 12, BayerFormat::Packing::CSI2 },
> > + { formats::SRGGB12_CSI2P,
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P) } },
> > + { { BayerFormat::BGGR, 16, BayerFormat::Packing::None },
> > + { formats::SBGGR16,
> V4L2PixelFormat(V4L2_PIX_FMT_SBGGR16) } },
> > + { { BayerFormat::GBRG, 16, BayerFormat::Packing::None },
> > + { formats::SGBRG16,
> V4L2PixelFormat(V4L2_PIX_FMT_SGBRG16) } },
> > + { { BayerFormat::GRBG, 16, BayerFormat::Packing::None },
> > + { formats::SGRBG16,
> V4L2PixelFormat(V4L2_PIX_FMT_SGRBG16) } },
> > + { { BayerFormat::RGGB, 16, BayerFormat::Packing::None },
> > + { formats::SRGGB16,
> V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) } },
> > + { { BayerFormat::MONO, 8, BayerFormat::Packing::None },
> > + { formats::R8, V4L2PixelFormat(V4L2_PIX_FMT_GREY) } },
> > + { { BayerFormat::MONO, 10, BayerFormat::Packing::None },
> > + { formats::R10, V4L2PixelFormat(V4L2_PIX_FMT_Y10) } },
>
> This isn't in the original table, so this addition should be highlighted
> clearly.
>
> Ideally it would have been a patch on it's own to provide the addition,
> either before the conversion, or after. But as long as it's mentioned in
> the commit message, I'm fine with it being here.
>
> We could add:
>
> """
> While updating the table, the unpacked V4L2_PIX_FMT_Y10 is mapped to the
> equivalent BayerFormat and formats::R10 accordingly.
> """
>
> If we get there in this series, that could be added while applying.
>
> So with one of those solutions:
>
I'll split this into 2 changes to be clearer.
Regards,
Naush
>
>
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>
> > + { { BayerFormat::MONO, 10, BayerFormat::Packing::CSI2 },
> > + { formats::R10_CSI2P, V4L2PixelFormat(V4L2_PIX_FMT_Y10P)
> } },
> > };
> >
> > const std::unordered_map<unsigned int, BayerFormat> mbusCodeToBayer{
> > @@ -245,9 +283,9 @@ bool operator==(const BayerFormat &lhs, const
> BayerFormat &rhs)
> > */
> > V4L2PixelFormat BayerFormat::toV4L2PixelFormat() const
> > {
> > - const auto it = bayerToV4l2.find(*this);
> > - if (it != bayerToV4l2.end())
> > - return it->second;
> > + const auto it = bayerToFormat.find(*this);
> > + if (it != bayerToFormat.end())
> > + return it->second.v4l2Format;
> >
> > return V4L2PixelFormat();
> > }
> > @@ -259,11 +297,11 @@ V4L2PixelFormat BayerFormat::toV4L2PixelFormat()
> const
> > */
> > BayerFormat BayerFormat::fromV4L2PixelFormat(V4L2PixelFormat v4l2Format)
> > {
> > - auto it = std::find_if(bayerToV4l2.begin(), bayerToV4l2.end(),
> > + auto it = std::find_if(bayerToFormat.begin(),
> bayerToFormat.end(),
> > [v4l2Format](const auto &i) {
> > - return i.second == v4l2Format;
> > + return i.second.v4l2Format ==
> v4l2Format;
> > });
> > - if (it != bayerToV4l2.end())
> > + if (it != bayerToFormat.end())
> > return it->first;
> >
> > return BayerFormat();
> > --
> > 2.25.1
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.libcamera.org/pipermail/libcamera-devel/attachments/20211028/da1f7418/attachment-0001.htm>
More information about the libcamera-devel
mailing list