libcamera: v4l2_subdevice: Use MEDIA_BUS_FMT_* macros

The V4L2_MBUS_FMT_* macros that define media bus formats are deprecated.
Use the MEDIA_BUS_FMT_* macros instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

1 files changed, 73 insertions, 73 deletions

diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
index ca6b43ce..ef79359e 100644
--- a/src/libcamera/v4l2_subdevice.cpp
+++ b/src/libcamera/v4l2_subdevice.cpp
@@ -54,79 +54,79 @@ struct V4L2SubdeviceFormatInfo {
  * bus codes
  */
 const std::map<uint32_t, V4L2SubdeviceFormatInfo> 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" } },
+	{ MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE, { 16, "RGB444_2X8_PADHI_BE" } },
+	{ MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE, { 16, "RGB444_2X8_PADHI_LE" } },
+	{ MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE, { 16, "RGB555_2X8_PADHI_BE" } },
+	{ MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE, { 16, "RGB555_2X8_PADHI_LE" } },
+	{ MEDIA_BUS_FMT_BGR565_2X8_BE, { 16, "BGR565_2X8_BE" } },
+	{ MEDIA_BUS_FMT_BGR565_2X8_LE, { 16, "BGR565_2X8_LE" } },
+	{ MEDIA_BUS_FMT_RGB565_2X8_BE, { 16, "RGB565_2X8_BE" } },
+	{ MEDIA_BUS_FMT_RGB565_2X8_LE, { 16, "RGB565_2X8_LE" } },
+	{ MEDIA_BUS_FMT_RGB666_1X18, { 18, "RGB666_1X18" } },
+	{ MEDIA_BUS_FMT_RGB888_1X24, { 24, "RGB888_1X24" } },
+	{ MEDIA_BUS_FMT_RGB888_2X12_BE, { 24, "RGB888_2X12_BE" } },
+	{ MEDIA_BUS_FMT_RGB888_2X12_LE, { 24, "RGB888_2X12_LE" } },
+	{ MEDIA_BUS_FMT_ARGB8888_1X32, { 32, "ARGB8888_1X32" } },
+	{ MEDIA_BUS_FMT_Y8_1X8, { 8, "Y8_1X8" } },
+	{ MEDIA_BUS_FMT_UV8_1X8, { 8, "UV8_1X8" } },
+	{ MEDIA_BUS_FMT_UYVY8_1_5X8, { 12, "UYVY8_1_5X8" } },
+	{ MEDIA_BUS_FMT_VYUY8_1_5X8, { 12, "VYUY8_1_5X8" } },
+	{ MEDIA_BUS_FMT_YUYV8_1_5X8, { 12, "YUYV8_1_5X8" } },
+	{ MEDIA_BUS_FMT_YVYU8_1_5X8, { 12, "YVYU8_1_5X8" } },
+	{ MEDIA_BUS_FMT_UYVY8_2X8, { 16, "UYVY8_2X8" } },
+	{ MEDIA_BUS_FMT_VYUY8_2X8, { 16, "VYUY8_2X8" } },
+	{ MEDIA_BUS_FMT_YUYV8_2X8, { 16, "YUYV8_2X8" } },
+	{ MEDIA_BUS_FMT_YVYU8_2X8, { 16, "YVYU8_2X8" } },
+	{ MEDIA_BUS_FMT_Y10_1X10, { 10, "Y10_1X10" } },
+	{ MEDIA_BUS_FMT_UYVY10_2X10, { 20, "UYVY10_2X10" } },
+	{ MEDIA_BUS_FMT_VYUY10_2X10, { 20, "VYUY10_2X10" } },
+	{ MEDIA_BUS_FMT_YUYV10_2X10, { 20, "YUYV10_2X10" } },
+	{ MEDIA_BUS_FMT_YVYU10_2X10, { 20, "YVYU10_2X10" } },
+	{ MEDIA_BUS_FMT_Y12_1X12, { 12, "Y12_1X12" } },
+	{ MEDIA_BUS_FMT_UYVY8_1X16, { 16, "UYVY8_1X16" } },
+	{ MEDIA_BUS_FMT_VYUY8_1X16, { 16, "VYUY8_1X16" } },
+	{ MEDIA_BUS_FMT_YUYV8_1X16, { 16, "YUYV8_1X16" } },
+	{ MEDIA_BUS_FMT_YVYU8_1X16, { 16, "YVYU8_1X16" } },
+	{ MEDIA_BUS_FMT_YDYUYDYV8_1X16, { 16, "YDYUYDYV8_1X16" } },
+	{ MEDIA_BUS_FMT_UYVY10_1X20, { 20, "UYVY10_1X20" } },
+	{ MEDIA_BUS_FMT_VYUY10_1X20, { 20, "VYUY10_1X20" } },
+	{ MEDIA_BUS_FMT_YUYV10_1X20, { 20, "YUYV10_1X20" } },
+	{ MEDIA_BUS_FMT_YVYU10_1X20, { 20, "YVYU10_1X20" } },
+	{ MEDIA_BUS_FMT_YUV10_1X30, { 30, "YUV10_1X30" } },
+	{ MEDIA_BUS_FMT_AYUV8_1X32, { 32, "AYUV8_1X32" } },
+	{ MEDIA_BUS_FMT_UYVY12_2X12, { 24, "UYVY12_2X12" } },
+	{ MEDIA_BUS_FMT_VYUY12_2X12, { 24, "VYUY12_2X12" } },
+	{ MEDIA_BUS_FMT_YUYV12_2X12, { 24, "YUYV12_2X12" } },
+	{ MEDIA_BUS_FMT_YVYU12_2X12, { 24, "YVYU12_2X12" } },
+	{ MEDIA_BUS_FMT_UYVY12_1X24, { 24, "UYVY12_1X24" } },
+	{ MEDIA_BUS_FMT_VYUY12_1X24, { 24, "VYUY12_1X24" } },
+	{ MEDIA_BUS_FMT_YUYV12_1X24, { 24, "YUYV12_1X24" } },
+	{ MEDIA_BUS_FMT_YVYU12_1X24, { 24, "YVYU12_1X24" } },
+	{ MEDIA_BUS_FMT_SBGGR8_1X8, { 8, "SBGGR8_1X8" } },
+	{ MEDIA_BUS_FMT_SGBRG8_1X8, { 8, "SGBRG8_1X8" } },
+	{ MEDIA_BUS_FMT_SGRBG8_1X8, { 8, "SGRBG8_1X8" } },
+	{ MEDIA_BUS_FMT_SRGGB8_1X8, { 8, "SRGGB8_1X8" } },
+	{ MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8, { 8, "SBGGR10_ALAW8_1X8" } },
+	{ MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8, { 8, "SGBRG10_ALAW8_1X8" } },
+	{ MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8, { 8, "SGRBG10_ALAW8_1X8" } },
+	{ MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8, { 8, "SRGGB10_ALAW8_1X8" } },
+	{ MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, { 8, "SBGGR10_DPCM8_1X8" } },
+	{ MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8, { 8, "SGBRG10_DPCM8_1X8" } },
+	{ MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8, { 8, "SGRBG10_DPCM8_1X8" } },
+	{ MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8, { 8, "SRGGB10_DPCM8_1X8" } },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE, { 16, "SBGGR10_2X8_PADHI_BE" } },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, { 16, "SBGGR10_2X8_PADHI_LE" } },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE, { 16, "SBGGR10_2X8_PADLO_BE" } },
+	{ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE, { 16, "SBGGR10_2X8_PADLO_LE" } },
+	{ MEDIA_BUS_FMT_SBGGR10_1X10, { 10, "SBGGR10_1X10" } },
+	{ MEDIA_BUS_FMT_SGBRG10_1X10, { 10, "SGBRG10_1X10" } },
+	{ MEDIA_BUS_FMT_SGRBG10_1X10, { 10, "SGRBG10_1X10" } },
+	{ MEDIA_BUS_FMT_SRGGB10_1X10, { 10, "SRGGB10_1X10" } },
+	{ MEDIA_BUS_FMT_SBGGR12_1X12, { 12, "SBGGR12_1X12" } },
+	{ MEDIA_BUS_FMT_SGBRG12_1X12, { 12, "SGBRG12_1X12" } },
+	{ MEDIA_BUS_FMT_SGRBG12_1X12, { 12, "SGRBG12_1X12" } },
+	{ MEDIA_BUS_FMT_SRGGB12_1X12, { 12, "SRGGB12_1X12" } },
+	{ MEDIA_BUS_FMT_AHSV8888_1X32, { 32, "AHSV8888_1X32" } },
 };
 
 } /* namespace */