From patchwork Fri Jul 15 13:50:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 16638 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 23897BE173 for ; Fri, 15 Jul 2022 13:50:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6847E63312; Fri, 15 Jul 2022 15:50:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657893020; bh=Oie67YQj7p2v4KPjp/A9D1h3JyAqukbUzHwUxjSqWu0=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=jUqpRF/7c7CHGVqCBWY8SxGEhcNG1r5T1pQRjsWtiQlWJr0OFlFsjl5QLBCYgI3Cu ZtqQ+IVMhOV2cWFCFF2jUJwZdqqYZKCyjeHmtmFzmU7WY7yZGTKriLmz9DwPvHFq/L ZppGtO0lg/9OXW+IjtmFiPQjry+Pu1H4/TB5RUJ/w3vDtyCpaBCb7wrH0Tg3u7LrmW VDi1k3S4xEYPtd5aDZpsk/Q9GgYaYLD6vWTz0KS9ZygfO5jteAMwM1RG7lPA87o081 lmqn4Zx6H7Hssy8vyLVV/PMCCA+QmyPgrjzGyC9P6sBmEMUf/Lh8zEPNjUgwG4CI0X 3H/EpbDqdIqYg== Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0EB396330A for ; Fri, 15 Jul 2022 15:50:19 +0200 (CEST) Received: (Authenticated sender: jacopo@jmondi.org) by mail.gandi.net (Postfix) with ESMTPSA id 2C16C60002; Fri, 15 Jul 2022 13:50:16 +0000 (UTC) To: libcamera-devel@lists.libcamera.org Date: Fri, 15 Jul 2022 15:50:00 +0200 Message-Id: <20220715135007.53574-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 0/7] libcamera: Map multiple V4L2 formats to a single libcamera::format 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: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Cc: jozef@mlich.cz, Pavel Machek Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This series addresses the requirement of mapping multiple V4L2 pixel formats to a single libcamera format. Specifically, it allows to map V4L2_PIX_FMT_JPEG and V4L2_PIX_FMT_MJPEG to libcamera::formats::MJPEG. The series starts by allowing to associate mulitple V4L2 FourCC in PixelFormatInfo and re-introduces toV4L2PixelFormat() in V4L2VideoDevice in order to select among from the list of V4L2 formats the first one supported from the video device. Patch [7/8] adds a multiplanar flag to V4L2VideoDevice::toV4L2PixelFormat() to allow selection of the contiguous or non-contiguous format versions. Finally, the last patch associates V4L2_PIX_FMT_JPEG to formats::MJPEG. Tested with a UVC camera. Pavel, could you please test on the pinephone please ? Thanks j Jacopo Mondi (7): libcamera: formats: Support multiple V4L2 pixel formats libcamera: formats: Search PixelFormatInfo on multiple formats libcamera: v4l2_pixelformat: Return a format list in fromPixelFormat() libcamera: v4l2_videodevice: Reintroduce toV4L2PixelFormat() libcamera: v4l2_videodevice: Match formats supported by the device libcamera: v4l2_videodevice: Add multiplanar argument to toV4L2PixelFormat libcamera: formats: Map V4L2_PIX_FMT_JPEG to formats::MJPEG Documentation/guides/pipeline-handler.rst | 7 +- include/libcamera/internal/formats.h | 4 +- include/libcamera/internal/v4l2_device.h | 1 + include/libcamera/internal/v4l2_pixelformat.h | 6 +- include/libcamera/internal/v4l2_videodevice.h | 9 +- src/libcamera/formats.cpp | 262 +++++++++--------- src/libcamera/pipeline/ipu3/cio2.cpp | 2 +- src/libcamera/pipeline/ipu3/imgu.cpp | 2 +- .../pipeline/raspberrypi/raspberrypi.cpp | 34 ++- src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 6 +- src/libcamera/pipeline/simple/converter.cpp | 8 +- src/libcamera/pipeline/simple/simple.cpp | 4 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 +- src/libcamera/pipeline/vimc/vimc.cpp | 8 +- src/libcamera/v4l2_device.cpp | 15 + src/libcamera/v4l2_pixelformat.cpp | 18 +- src/libcamera/v4l2_videodevice.cpp | 41 ++- src/v4l2/v4l2_camera_proxy.cpp | 6 +- test/libtest/buffer_source.cpp | 2 +- 19 files changed, 258 insertions(+), 183 deletions(-) --- 2.36.1