From patchwork Wed May 4 13:15:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15770 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9F773C326D for ; Wed, 4 May 2022 13:16:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 844AD6564B; Wed, 4 May 2022 15:16:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651670167; bh=+3DZOjT4McxSsi44ACUnpOIt8++7UhX2jVKPuHCQhcw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=hoKbmYCqOMn24AlWwC5iTPQaaIOu2e+mgJM6DXjr9uywPqK8Owfc/NzjYVKw3QrrM c/zI3ICjI3+14R+zvDYZvTTaDtUApUQvhwoEm8tOrer+ttngBbwLRx8GJS+cVn1XVd YkO3UTZrzwIre12EEMBYOpTEDRQhXtditu36EmnbozwzjDjkwQUd3KafeOvIYf4TW0 EVKZaFhWb9TEdusMr7nG+qS9yHvturZJE8MEsAxtqSrH8y824uDxgTH9UZz/3IqlVM RA5eXZWnon3ul2v4Pk3RGKX5mHmFx2cVW8SG7/82JTwO2nQ5gNKOmmsExL4CdEs9jY 8xSIqBoyTVajw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E75B0604A4 for ; Wed, 4 May 2022 15:16:04 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jYKJ1rD2"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 805CD835 for ; Wed, 4 May 2022 15:16:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651670164; bh=+3DZOjT4McxSsi44ACUnpOIt8++7UhX2jVKPuHCQhcw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jYKJ1rD2EaC8IAD/gHLDUsxspG2vtyYT7Z/YSvSKwfp03j0OtUBnmPon3PHGWImmR fSfhHoQxvlToV4BlmJg8wWf+TCRdmQxVXdYUImB88/H0sin8YA+6ZYI9qaF/gIg3h+ 5oe2gWEYlUucnhJiikV52rZEzqlWOSGNrCt0Zg3s= To: libcamera-devel@lists.libcamera.org Date: Wed, 4 May 2022 16:15:56 +0300 Message-Id: <20220504131558.9498-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220504131558.9498-1-laurent.pinchart@ideasonboard.com> References: <20220504131558.9498-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/5] libcamera: v4l2_subdevice: Use MEDIA_BUS_FMT_* macros X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The V4L2_MBUS_FMT_* macros that define media bus formats are deprecated. Use the MEDIA_BUS_FMT_* macros instead. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/libcamera/v4l2_subdevice.cpp | 146 +++++++++++++++---------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index ca6b43cea5f1..ef79359e3e5f 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -54,79 +54,79 @@ struct V4L2SubdeviceFormatInfo { * bus codes */ const std::map 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 */