From patchwork Thu Oct 19 14:01:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 19148 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 62E26C3272 for ; Thu, 19 Oct 2023 14:01:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1B61962980; Thu, 19 Oct 2023 16:01:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1697724110; bh=/N4YGMMYk5PaZEEC88n/qZxxMZSxwR7BqMVuTXGXPiE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=O80Dazg30Ne6eP/TdhMBWnJm+tw5hD/FxSIJAtzOABDJZkDk+FBBxvy83fzxw1WCd 8NvX+LguHtxmFujAM1+6iAlDEvmgHsJOmJhCyZJO6xd+5GhL4bn/H9on23sGjVK8Vs ef08lxQYHzm5qfp/hhAkaa1L6DK8FfTN6icz3qQhalTRcVKsfkWiUYNnGImlW+ajWV 68Aof4AuC/UYUmrXOWsMjMJ0+akO+bTEynPgJYz/MMjDpb8+r0rCna2EKFFWmwJvTB 6oo08a1Bn2U2SXmh5JcEFnkTZ/7lXrbPm3kbYR63AzOO+PrOgrp/EwkoXTB+Ocl5l4 m6bJAU2FKeWfg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 44DA461DD2 for ; Thu, 19 Oct 2023 16:01:49 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vGTYMiZs"; dkim-atps=neutral Received: from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it [93.61.96.190]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2C96D276; Thu, 19 Oct 2023 16:01:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1697724101; bh=/N4YGMMYk5PaZEEC88n/qZxxMZSxwR7BqMVuTXGXPiE=; h=From:To:Cc:Subject:Date:From; b=vGTYMiZsGerY/r/OmP4MH7gzzCINeTG6F9jFeDo7PAUswex3m45sjO51YopJT0ebl 4iABIm5BmHKVuo1zCbt8bM/Q4h+lxgMgOFAK5X37WtTkqfVwZvhCxQcV/hkcyaN92X IUuzAEsc3sQi7Vs4ISwGSZib7cH0IhBf6l1Oz0DY= To: libcamera-devel@lists.libcamera.org Date: Thu, 19 Oct 2023 16:01:21 +0200 Message-ID: <20231019140133.32090-1-jacopo.mondi@ideasonboard.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 0/12] libcamera: Replace CameraConfiguration::transform 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: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" v5->v6: - Rename enum members - replace images with svg - fix documentation v4->v5: - Add support in Python layer - Rebased on master v3->v4: - Remove unrelated change in 8/10 - Remove a double test case - Add David's tags v2->v3: - Move Orientation out of CameraConfiguration to a dedicated file - Change operator*(Transform, Transform) - Address David's comments in documentation and commit messages v1->v2: - Provide a better definitio of Orientation based on two basic operations - Provide functions to combine Orientation and Transpose - Provide tests - Do not adjust properties::Rotation anymore This series proposes to replace the usage to Transform in the public API in favour of a new Orientation type, defined based on the EXIF specification, tag 274, 'orientation'. For reference this is the same as implemented by gstreamer: https://gstreamer.freedesktop.org/documentation/gstreamer/gsttaglist.html?gi-language=c#GST_TAG_IMAGE_ORIENTATION (the names of the enum values are different as gstreamer expresses the "correction" while we express the actual orientation in memory buffers). The newly introduced CameraConfiguration::orientation replaces the existing CameraConfiguration::tranform, and it is meant for application to express how they would like the images to be oriented, not to tell libcamera what to do. As an example, passing in 'rotation0' means that the application expects the images to be rotated upright, and doesn't tell libcamera not to apply any rotation like passing in "Transform::Identity" did. The value CameraConfiguration::orientation is set to after a validate() also differs in meaning, as instead of reporting "what applications have to do to obtain what they originally asked for" it simply reports the actual orientation of the stream: this means that if libcamera cannot fully satisfy the user request it will set ::orientation to report the native images rotation and the CameraConfiguration::status will be set to Adjusted. Handling of 90 and 270 degrees rotation has also changed: as the camera sensor cannot correct rotations that include a transposition, requests for a 90/270 corrections are ignored. This makes it clear and less confusing for applications that they have to deal with correction fully by themselves. As an example, with the current implementation if the application requires a Rot270 (HFlip + Transpose) libcamera will do the HFlip and leave transposition to the upper layers. There is no clear advantage in doing so, and display compositors are better suited for handling transpositions and flipping in a single pass instead of having the library try to handle part of that. This series clearly breaks the application API as it removes a member from CameraConfiguration, so it should be introduced probably only when a new release is cut. Tested on RPi imx219 with the newly introduced cam option, flip, mirror and rotation work as expected. *** BLURB HERE *** Jacopo Mondi (12): libcamera: camera_sensor: Cache rotationTransform_ libcamera: camera: Introduce Orientation Documentation: Add figures to document Orientation libcamera: properties: Make 'Rotation' the mounting rotation libcamera: transform: Add functions to convert Orientation libcamera: transform: Invert operator*() operands libcamera: transform: Add operations with Orientation test: Add unit test for Transform and Orientation py: libcamera: Define and use Orientation libcamera: Use CameraConfiguration::orientation apps: cam: Add option to set stream orientation py: cam: Add option to set stream orientation Documentation/Doxyfile.in | 2 + Documentation/rotation/rotate0.svg | 132 +++++++ Documentation/rotation/rotate0Mirror.svg | 135 +++++++ Documentation/rotation/rotate180.svg | 135 +++++++ Documentation/rotation/rotate180Mirror.svg | 135 +++++++ Documentation/rotation/rotate270.svg | 135 +++++++ Documentation/rotation/rotate270Mirror.svg | 135 +++++++ Documentation/rotation/rotate90.svg | 135 +++++++ Documentation/rotation/rotate90Mirror.svg | 135 +++++++ include/libcamera/camera.h | 4 +- include/libcamera/internal/camera_sensor.h | 5 +- include/libcamera/meson.build | 1 + include/libcamera/orientation.h | 28 ++ include/libcamera/transform.h | 7 + src/apps/cam/camera_session.cpp | 18 + src/apps/cam/main.cpp | 5 + src/apps/cam/main.h | 1 + src/libcamera/camera.cpp | 20 +- src/libcamera/camera_sensor.cpp | 131 ++++--- src/libcamera/meson.build | 1 + src/libcamera/orientation.cpp | 79 +++++ src/libcamera/pipeline/ipu3/ipu3.cpp | 6 +- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 8 +- .../pipeline/rpi/common/pipeline_base.cpp | 9 +- src/libcamera/pipeline/simple/simple.cpp | 6 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 +- src/libcamera/pipeline/vimc/vimc.cpp | 4 +- src/libcamera/property_ids.yaml | 8 +- src/libcamera/transform.cpp | 112 +++++- src/py/cam/cam.py | 21 ++ src/py/libcamera/py_enums.cpp | 10 + src/py/libcamera/py_main.cpp | 2 +- test/meson.build | 1 + test/transform.cpp | 329 ++++++++++++++++++ 34 files changed, 1787 insertions(+), 112 deletions(-) create mode 100644 Documentation/rotation/rotate0.svg create mode 100644 Documentation/rotation/rotate0Mirror.svg create mode 100644 Documentation/rotation/rotate180.svg create mode 100644 Documentation/rotation/rotate180Mirror.svg create mode 100644 Documentation/rotation/rotate270.svg create mode 100644 Documentation/rotation/rotate270Mirror.svg create mode 100644 Documentation/rotation/rotate90.svg create mode 100644 Documentation/rotation/rotate90Mirror.svg create mode 100644 include/libcamera/orientation.h create mode 100644 src/libcamera/orientation.cpp create mode 100644 test/transform.cpp Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- 2.42.0