[libcamera-devel] [PATCH v3] libcamera: v4l2subdev: Print mbus string instead of code
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Tue Jun 2 22:58:33 CEST 2020
Hello,
On Tue, Jun 02, 2020 at 10:49:17AM +0100, Kieran Bingham wrote:
> Hi Kaaira,
>
> I have applied this to my next branch and will merge to master later
> after tests if there are no further comments.
A few additional comments I'm afraid :-)
> On 01/06/2020 19:52, Kaaira Gupta wrote:
> > Modify toString() to print mbus format string instead of its hex code as
> > the string is easier to understand.
> >
> > Signed-off-by: Kaaira Gupta <kgupta at es.iitr.ac.in>
> > Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> > Acked-by: Jacopo Mondi <jacopo at jmondi.org>
> > ---
> >
> > (sending again because I missed the tags in the previous patch)
> >
> > Changes since V2:
> > Re-formatted the code.
> >
> > Changes since v1:
> > Add check for unsupported format.
> > Rename struct
> >
> >
> > src/libcamera/v4l2_subdevice.cpp | 175 +++++++++++++++++--------------
> > 1 file changed, 96 insertions(+), 79 deletions(-)
> >
> > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
> > index 7aefc1b..f3cd04b 100644
> > --- a/src/libcamera/v4l2_subdevice.cpp
> > +++ b/src/libcamera/v4l2_subdevice.cpp
> > @@ -35,84 +35,93 @@ LOG_DECLARE_CATEGORY(V4L2)
> >
> > namespace {
> >
> > +/*
> > + * \struct mbusFormatInfo
The structure name should start with an uppercase letter, like all type
names (MbusFormatInfo or MBusFormatInfo ? MediaBusFormatInfo and
V4L2SubdeviceFormatInfo are alternatives, the latter because it
describes a format carried in the V4L2SubdeviceFormat class.
> > + * \brief Bits per pixel and mbus format
This will need to be updated every time a field is added. How about
"Information about media bus formats" ?
The fields should be documented too.
> > + */
> > +struct mbusFormatInfo {
> > + unsigned int bits;
Should this field be named "bitsPerPixel" ?
> > + std::string format;
Should this be a const char * ? Should the field be named "name" ?
> > +};
> > +
> > /*
> > * \var formatInfoMap
> > - * \brief A map that associates bits per pixel to V4L2 media bus codes
> > + * \brief A map that associates mbusFormatInfo struct to V4L2 media bus codes
> > */
> > -const std::map<uint32_t, unsigned int> formatInfoMap = {
> > - { V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE, 16 },
> > - { V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE, 16 },
> > - { V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, 16 },
> > - { V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, 16 },
> > - { V4L2_MBUS_FMT_BGR565_2X8_BE, 16 },
> > - { V4L2_MBUS_FMT_BGR565_2X8_LE, 16 },
> > - { V4L2_MBUS_FMT_RGB565_2X8_BE, 16 },
> > - { V4L2_MBUS_FMT_RGB565_2X8_LE, 16 },
> > - { V4L2_MBUS_FMT_RGB666_1X18, 18 },
> > - { V4L2_MBUS_FMT_RGB888_1X24, 24 },
> > - { V4L2_MBUS_FMT_RGB888_2X12_BE, 24 },
> > - { V4L2_MBUS_FMT_RGB888_2X12_LE, 24 },
> > - { V4L2_MBUS_FMT_ARGB8888_1X32, 32 },
> > - { V4L2_MBUS_FMT_Y8_1X8, 8 },
> > - { V4L2_MBUS_FMT_UV8_1X8, 8 },
> > - { V4L2_MBUS_FMT_UYVY8_1_5X8, 12 },
> > - { V4L2_MBUS_FMT_VYUY8_1_5X8, 12 },
> > - { V4L2_MBUS_FMT_YUYV8_1_5X8, 12 },
> > - { V4L2_MBUS_FMT_YVYU8_1_5X8, 12 },
> > - { V4L2_MBUS_FMT_UYVY8_2X8, 16 },
> > - { V4L2_MBUS_FMT_VYUY8_2X8, 16 },
> > - { V4L2_MBUS_FMT_YUYV8_2X8, 16 },
> > - { V4L2_MBUS_FMT_YVYU8_2X8, 16 },
> > - { V4L2_MBUS_FMT_Y10_1X10, 10 },
> > - { V4L2_MBUS_FMT_UYVY10_2X10, 20 },
> > - { V4L2_MBUS_FMT_VYUY10_2X10, 20 },
> > - { V4L2_MBUS_FMT_YUYV10_2X10, 20 },
> > - { V4L2_MBUS_FMT_YVYU10_2X10, 20 },
> > - { V4L2_MBUS_FMT_Y12_1X12, 12 },
> > - { V4L2_MBUS_FMT_UYVY8_1X16, 16 },
> > - { V4L2_MBUS_FMT_VYUY8_1X16, 16 },
> > - { V4L2_MBUS_FMT_YUYV8_1X16, 16 },
> > - { V4L2_MBUS_FMT_YVYU8_1X16, 16 },
> > - { V4L2_MBUS_FMT_YDYUYDYV8_1X16, 16 },
> > - { V4L2_MBUS_FMT_UYVY10_1X20, 20 },
> > - { V4L2_MBUS_FMT_VYUY10_1X20, 20 },
> > - { V4L2_MBUS_FMT_YUYV10_1X20, 20 },
> > - { V4L2_MBUS_FMT_YVYU10_1X20, 20 },
> > - { V4L2_MBUS_FMT_YUV10_1X30, 30 },
> > - { V4L2_MBUS_FMT_AYUV8_1X32, 32 },
> > - { V4L2_MBUS_FMT_UYVY12_2X12, 24 },
> > - { V4L2_MBUS_FMT_VYUY12_2X12, 24 },
> > - { V4L2_MBUS_FMT_YUYV12_2X12, 24 },
> > - { V4L2_MBUS_FMT_YVYU12_2X12, 24 },
> > - { V4L2_MBUS_FMT_UYVY12_1X24, 24 },
> > - { V4L2_MBUS_FMT_VYUY12_1X24, 24 },
> > - { V4L2_MBUS_FMT_YUYV12_1X24, 24 },
> > - { V4L2_MBUS_FMT_YVYU12_1X24, 24 },
> > - { V4L2_MBUS_FMT_SBGGR8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGBRG8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGRBG8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SRGGB8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SBGGR10_ALAW8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGBRG10_ALAW8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SRGGB10_ALAW8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, 8 },
> > - { V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, 16 },
> > - { V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, 16 },
> > - { V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, 16 },
> > - { V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, 16 },
> > - { V4L2_MBUS_FMT_SBGGR10_1X10, 10 },
> > - { V4L2_MBUS_FMT_SGBRG10_1X10, 10 },
> > - { V4L2_MBUS_FMT_SGRBG10_1X10, 10 },
> > - { V4L2_MBUS_FMT_SRGGB10_1X10, 10 },
> > - { V4L2_MBUS_FMT_SBGGR12_1X12, 12 },
> > - { V4L2_MBUS_FMT_SGBRG12_1X12, 12 },
> > - { V4L2_MBUS_FMT_SGRBG12_1X12, 12 },
> > - { V4L2_MBUS_FMT_SRGGB12_1X12, 12 },
> > - { V4L2_MBUS_FMT_AHSV8888_1X32, 32 },
> > +const std::map<uint32_t, mbusFormatInfo> formatInfoMap = {
> > + { V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE, { 16, "RGB444_2X8_PADHI_BE" } },
> > + { V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE, { 16, "RGB444_2X8_PADHI_LE" } },
> > + { V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, { 16, "RGB555_2X8_PADHI_BE" } },
> > + { V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, { 16, "RGB555_2X8_PADHI_LE" } },
> > + { V4L2_MBUS_FMT_BGR565_2X8_BE, { 16, "BGR565_2X8_BE" } },
> > + { V4L2_MBUS_FMT_BGR565_2X8_LE, { 16, "BGR565_2X8_LE" } },
> > + { V4L2_MBUS_FMT_RGB565_2X8_BE, { 16, "RGB565_2X8_BE" } },
> > + { V4L2_MBUS_FMT_RGB565_2X8_LE, { 16, "RGB565_2X8_LE" } },
> > + { V4L2_MBUS_FMT_RGB666_1X18, { 18, "RGB666_1X18" } },
> > + { V4L2_MBUS_FMT_RGB888_1X24, { 24, "RGB888_1X24" } },
> > + { V4L2_MBUS_FMT_RGB888_2X12_BE, { 24, "RGB888_2X12_BE" } },
> > + { V4L2_MBUS_FMT_RGB888_2X12_LE, { 24, "RGB888_2X12_LE" } },
> > + { V4L2_MBUS_FMT_ARGB8888_1X32, { 32, "ARGB8888_1X32" } },
> > + { V4L2_MBUS_FMT_Y8_1X8, { 8, "Y8_1X8" } },
> > + { V4L2_MBUS_FMT_UV8_1X8, { 8, "UV8_1X8" } },
> > + { V4L2_MBUS_FMT_UYVY8_1_5X8, { 12, "UYVY8_1_5X8" } },
> > + { V4L2_MBUS_FMT_VYUY8_1_5X8, { 12, "VYUY8_1_5X8" } },
> > + { V4L2_MBUS_FMT_YUYV8_1_5X8, { 12, "YUYV8_1_5X8" } },
> > + { V4L2_MBUS_FMT_YVYU8_1_5X8, { 12, "YVYU8_1_5X8" } },
> > + { V4L2_MBUS_FMT_UYVY8_2X8, { 16, "UYVY8_2X8" } },
> > + { V4L2_MBUS_FMT_VYUY8_2X8, { 16, "VYUY8_2X8" } },
> > + { V4L2_MBUS_FMT_YUYV8_2X8, { 16, "YUYV8_2X8" } },
> > + { V4L2_MBUS_FMT_YVYU8_2X8, { 16, "YVYU8_2X8" } },
> > + { V4L2_MBUS_FMT_Y10_1X10, { 10, "Y10_1X10" } },
> > + { V4L2_MBUS_FMT_UYVY10_2X10, { 20, "UYVY10_2X10" } },
> > + { V4L2_MBUS_FMT_VYUY10_2X10, { 20, "VYUY10_2X10" } },
> > + { V4L2_MBUS_FMT_YUYV10_2X10, { 20, "YUYV10_2X10" } },
> > + { V4L2_MBUS_FMT_YVYU10_2X10, { 20, "YVYU10_2X10" } },
> > + { V4L2_MBUS_FMT_Y12_1X12, { 12, "Y12_1X12" } },
> > + { V4L2_MBUS_FMT_UYVY8_1X16, { 16, "UYVY8_1X16" } },
> > + { V4L2_MBUS_FMT_VYUY8_1X16, { 16, "VYUY8_1X16" } },
> > + { V4L2_MBUS_FMT_YUYV8_1X16, { 16, "YUYV8_1X16" } },
> > + { V4L2_MBUS_FMT_YVYU8_1X16, { 16, "YVYU8_1X16" } },
> > + { V4L2_MBUS_FMT_YDYUYDYV8_1X16, { 16, "YDYUYDYV8_1X16" } },
> > + { V4L2_MBUS_FMT_UYVY10_1X20, { 20, "UYVY10_1X20" } },
> > + { V4L2_MBUS_FMT_VYUY10_1X20, { 20, "VYUY10_1X20" } },
> > + { V4L2_MBUS_FMT_YUYV10_1X20, { 20, "YUYV10_1X20" } },
> > + { V4L2_MBUS_FMT_YVYU10_1X20, { 20, "YVYU10_1X20" } },
> > + { V4L2_MBUS_FMT_YUV10_1X30, { 30, "YUV10_1X30" } },
> > + { V4L2_MBUS_FMT_AYUV8_1X32, { 32, "AYUV8_1X32" } },
> > + { V4L2_MBUS_FMT_UYVY12_2X12, { 24, "UYVY12_2X12" } },
> > + { V4L2_MBUS_FMT_VYUY12_2X12, { 24, "VYUY12_2X12" } },
> > + { V4L2_MBUS_FMT_YUYV12_2X12, { 24, "YUYV12_2X12" } },
> > + { V4L2_MBUS_FMT_YVYU12_2X12, { 24, "YVYU12_2X12" } },
> > + { V4L2_MBUS_FMT_UYVY12_1X24, { 24, "UYVY12_1X24" } },
> > + { V4L2_MBUS_FMT_VYUY12_1X24, { 24, "VYUY12_1X24" } },
> > + { V4L2_MBUS_FMT_YUYV12_1X24, { 24, "YUYV12_1X24" } },
> > + { V4L2_MBUS_FMT_YVYU12_1X24, { 24, "YVYU12_1X24" } },
> > + { V4L2_MBUS_FMT_SBGGR8_1X8, { 8, "SBGGR8_1X8" } },
> > + { V4L2_MBUS_FMT_SGBRG8_1X8, { 8, "SGBRG8_1X8" } },
> > + { V4L2_MBUS_FMT_SGRBG8_1X8, { 8, "SGRBG8_1X8" } },
> > + { V4L2_MBUS_FMT_SRGGB8_1X8, { 8, "SRGGB8_1X8" } },
> > + { V4L2_MBUS_FMT_SBGGR10_ALAW8_1X8, { 8, "SBGGR10_ALAW8_1X8" } },
> > + { V4L2_MBUS_FMT_SGBRG10_ALAW8_1X8, { 8, "SGBRG10_ALAW8_1X8" } },
> > + { V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8, { 8, "SGRBG10_ALAW8_1X8" } },
> > + { V4L2_MBUS_FMT_SRGGB10_ALAW8_1X8, { 8, "SRGGB10_ALAW8_1X8" } },
> > + { V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, { 8, "SBGGR10_DPCM8_1X8" } },
> > + { V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, { 8, "SGBRG10_DPCM8_1X8" } },
> > + { V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, { 8, "SGRBG10_DPCM8_1X8" } },
> > + { V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, { 8, "SRGGB10_DPCM8_1X8" } },
> > + { V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, { 16, "SBGGR10_2X8_PADHI_BE" } },
> > + { V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, { 16, "SBGGR10_2X8_PADHI_LE" } },
> > + { V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, { 16, "SBGGR10_2X8_PADLO_BE" } },
> > + { V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, { 16, "SBGGR10_2X8_PADLO_LE" } },
> > + { V4L2_MBUS_FMT_SBGGR10_1X10, { 10, "SBGGR10_1X10" } },
> > + { V4L2_MBUS_FMT_SGBRG10_1X10, { 10, "SGBRG10_1X10" } },
> > + { V4L2_MBUS_FMT_SGRBG10_1X10, { 10, "SGRBG10_1X10" } },
> > + { V4L2_MBUS_FMT_SRGGB10_1X10, { 10, "SRGGB10_1X10" } },
> > + { V4L2_MBUS_FMT_SBGGR12_1X12, { 12, "SBGGR12_1X12" } },
> > + { V4L2_MBUS_FMT_SGBRG12_1X12, { 12, "SGBRG12_1X12" } },
> > + { V4L2_MBUS_FMT_SGRBG12_1X12, { 12, "SGRBG12_1X12" } },
> > + { V4L2_MBUS_FMT_SRGGB12_1X12, { 12, "SRGGB12_1X12" } },
> > + { V4L2_MBUS_FMT_AHSV8888_1X32, { 32, "AHSV8888_1X32" } },
> > };
> >
> > } /* namespace */
> > @@ -161,9 +170,17 @@ const std::map<uint32_t, unsigned int> formatInfoMap = {
> > */
> > const std::string V4L2SubdeviceFormat::toString() const
> > {
> > - std::stringstream ss;
> > - ss << size.toString() << "-" << utils::hex(mbus_code, 4);
> > - return ss.str();
> > + std::stringstream mbus;
> > + mbus << size.toString() << "-";
> > +
> > + const auto it = formatInfoMap.find(mbus_code);
> > +
> > + if (it == formatInfoMap.end())
> > + mbus << utils::hex(mbus_code, 4);
> > + else
> > + mbus << it->second.format;
> > +
> > + return mbus.str();
> > }
> >
> > /**
> > @@ -180,7 +197,7 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const
> > return 0;
> > }
> >
> > - return it->second;
> > + return it->second.bits;
> > }
> >
> > /**
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list