From patchwork Mon Mar 16 21:43:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3121 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D5CB7629AE for ; Mon, 16 Mar 2020 22:43:23 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ACD48AD8; Mon, 16 Mar 2020 22:43:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584395003; bh=sYEj5f1OrBoH6UbQEUW5Sb/y9bAOVW0zGOQKWfBWLz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OiJNVgy0gdNJITqmLOfc7yu9E6w/csyE9w0AjbdXQzMStMr3TBbC/3+sfRfo8Wdz3 nCzhb4z2Ccxe5RiJAlCLHYEM96fJiipC/SlyS1/hWzHL5DjbkajwLvNxW7Qw4PXyN7 LBCik0y6uVIpE1JjTv+mwZh4JKaqYOD5RuXRsLqI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: Martijn Braam , Mickael GUENE , Benjamin GAIGNARD , Andrey Konovalov Date: Mon, 16 Mar 2020 23:43:04 +0200 Message-Id: <20200316214310.27665-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200316214310.27665-1-laurent.pinchart@ideasonboard.com> References: <20200316214310.27665-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 04/10] libcamera: v4l2_videodevice: Support filtering formats by media bus code 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-List-Received-Date: Mon, 16 Mar 2020 21:43:24 -0000 Add support for the recent V4L2 extension to VIDIOC_ENUM_FMT that allows filtering pixel formats by media bus codes. Signed-off-by: Laurent Pinchart --- src/libcamera/include/v4l2_videodevice.h | 4 ++-- src/libcamera/v4l2_videodevice.cpp | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h index 2507daf23efa..7196cabd09c7 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/src/libcamera/include/v4l2_videodevice.h @@ -184,7 +184,7 @@ public: int getFormat(V4L2DeviceFormat *format); int setFormat(V4L2DeviceFormat *format); - ImageFormats formats(); + ImageFormats formats(uint32_t code = 0); int setCrop(Rectangle *rect); int setCompose(Rectangle *rect); @@ -222,7 +222,7 @@ private: int getFormatSingleplane(V4L2DeviceFormat *format); int setFormatSingleplane(V4L2DeviceFormat *format); - std::vector enumPixelformats(); + std::vector enumPixelformats(uint32_t code); std::vector enumSizes(unsigned int pixelFormat); int setSelection(unsigned int target, Rectangle *rect); diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index f17e0136b5cb..084394fa5380 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -896,16 +896,19 @@ int V4L2VideoDevice::setFormatSingleplane(V4L2DeviceFormat *format) /** * \brief Enumerate all pixel formats and frame sizes + * \param[in] code Restrict formats to this media bus code. * * Enumerate all pixel formats and frame sizes supported by the video device. + * If the \a code argument is not zero, only formats compatible with that media + * bus code will be enumerated. * * \return A list of the supported video device formats */ -ImageFormats V4L2VideoDevice::formats() +ImageFormats V4L2VideoDevice::formats(uint32_t code) { ImageFormats formats; - for (unsigned int pixelformat : enumPixelformats()) { + for (unsigned int pixelformat : enumPixelformats(code)) { std::vector sizes = enumSizes(pixelformat); if (sizes.empty()) return {}; @@ -921,7 +924,7 @@ ImageFormats V4L2VideoDevice::formats() return formats; } -std::vector V4L2VideoDevice::enumPixelformats() +std::vector V4L2VideoDevice::enumPixelformats(uint32_t code) { std::vector formats; int ret; @@ -930,11 +933,18 @@ std::vector V4L2VideoDevice::enumPixelformats() struct v4l2_fmtdesc pixelformatEnum = {}; pixelformatEnum.index = index; pixelformatEnum.type = bufferType_; + pixelformatEnum.mbus_code = code; ret = ioctl(VIDIOC_ENUM_FMT, &pixelformatEnum); if (ret) break; + if (code && !(pixelformatEnum.flags & V4L2_FMT_FLAG_MBUS_CODE)) { + LOG(V4L2, Error) + << "Media bus code filtering not supported by the device"; + return {}; + } + formats.push_back(pixelformatEnum.pixelformat); }