From patchwork Fri Jul 29 16:00:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 16869 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 B63FDC3275 for ; Fri, 29 Jul 2022 16:00:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E007E63313; Fri, 29 Jul 2022 18:00:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1659110424; bh=RQLkfWDdVD3M7qnHWr6F7MHlv8NJZOdtxL61N3+6V1g=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=jkZmlJZmpO1F7R3zIgd2QX3VCGvkZKCcUTvOidfEeZtF2rNL7WNkklmIa+gjsWhsp MZMuMsQWDsoZHjOuMUCHiqhs9VIb4TthafcCQ16kio3qvM6EAjIpPGLCNGXv8bTjwR ZMZ4cTVfX4E50+fsBcgSMyQz36CuQhBTsHZu3C3FMcTjHK8SZtOXOPGBNaqc+x1kqe 0hkNjMf22Rl8cLOeWETti/WF6OwTslqrviieQtLEGanC27DfCg6PcW2ewuOfZdU+AI RPE/EmLjrj97pwadJ55HNtNiOA56kQIXfEjHVsFiWn05SUq8fb2WHsWiZRYjZ4flc6 oQHMJOIn4yGGA== Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 93BD7603EC for ; Fri, 29 Jul 2022 18:00:22 +0200 (CEST) Received: (Authenticated sender: jacopo@jmondi.org) by mail.gandi.net (Postfix) with ESMTPSA id 1818440006; Fri, 29 Jul 2022 16:00:20 +0000 (UTC) To: libcamera-devel@lists.libcamera.org Date: Fri, 29 Jul 2022 18:00:08 +0200 Message-Id: <20220729160014.101503-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 0/6] 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. When testing on Pinephone I was able to capture JPEG (but not to inspect images) and YUYV. As soon as I was about to run cam with SDL backend on pinephone, the back sensor started failing consistently at boot with: [ 15.772368] ov5640 3-004c: ov5640_init_slave_id: failed with -6 Have I broke my pinephone camera ?? If anyone else would like to test: cam -c2 --stream pixelformat=YUYV,width=640,height=480 -C -S (Assuming you have SDL2 installed on your system and available at build time) Anyway, formats mapping works it seems... I have dropped all tags, as the series is now rather different than v2. v2->v3: - Resorted patches as suggested by Laurent - Remove 'multiplanar' argument in the call chain - Cache the V4L2VideoDevice formats at open() time v1->v2: - Add a missing conversion using the video device in Simple converter - Map formats::MJPEG to V4L2_PIX_FMT_JPEG in v4l2 formats enumeration Jacopo Mondi (6): libcamera: formats: Merge V4L2 single and multi formats libcamera: formats: Search PixelFormatInfo on multiple formats libcamera: v4l2_videodevice: Reintroduce toV4L2PixelFormat() libcamera: v4l2_pixelformat: Return the list of V4L2 formats libcamera: v4l2_videodevice: Match formats supported by the device libcamera: formats: Map V4L2_PIX_FMT_JPEG to formats::MJPEG Documentation/guides/pipeline-handler.rst | 7 +- include/libcamera/internal/formats.h | 5 +- include/libcamera/internal/v4l2_pixelformat.h | 5 +- include/libcamera/internal/v4l2_videodevice.h | 3 + src/libcamera/formats.cpp | 320 +++++------------- 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 | 10 +- src/libcamera/pipeline/simple/simple.cpp | 4 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 +- src/libcamera/pipeline/vimc/vimc.cpp | 8 +- src/libcamera/v4l2_pixelformat.cpp | 23 +- src/libcamera/v4l2_videodevice.cpp | 32 ++ src/v4l2/v4l2_camera_proxy.cpp | 6 +- test/libtest/buffer_source.cpp | 2 +- 17 files changed, 180 insertions(+), 295 deletions(-) --- 2.37.1