From patchwork Fri Dec 13 06:03:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Hou X-Patchwork-Id: 22304 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 EF65EC32F0 for ; Fri, 13 Dec 2024 06:04:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D717967EDE; Fri, 13 Dec 2024 07:04:14 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="EaQF+cOb"; dkim-atps=neutral Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2061d.outbound.protection.outlook.com [IPv6:2a01:111:f403:2606::61d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 663646189B for ; Fri, 13 Dec 2024 07:03:44 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JrJdq+/RG9ZN1UWe65H38TdSx4MkHCzD0XoZ8uaumV8jh1ly4fJRzRrmlmBOQp9sJytP8OaRLwkPlrgOaHkAxUW+o06nO07sUyUm8AGymi87uGfCCv3//timWAYifWiTtuxL1wMbt18F2czd7NJxpfD+DI3QWrIaRKS30VfLemCgDtnvN/pjD5eb6KG5m97SEQe4sTUic3XguDYC9v/jV5o40m5nuhcorHbXM9nUjdAgx0xzor+AdnMNYgkFW6kLnKG8wz4wMNSh6tSDgYBv2vz21twiue+GLinGk0I640HLSoeLa7mWsJ9QrGfD54momWx7nTq6saIzQEhtBlQXFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9nvM3iY+Prcb5FORfjI4WVoI++cmP+ZsJ78var6NgUw=; b=Cis2Yw5kERV65S3JMPwLMhEFYTPyg2U75bkrgPsDGkTy8kuSVr0Z5L4OhpmOkf/jZprfrjhDVIFtm0/Ugg/KYG4POlhPkVZEzdj2wOFxS5i+X5qLF7JIZbg7MG8MPlBjUqZP7SQWuduGbiQI+kv0kEawSVmwWBdyeD5r0KnLGMGJLAaBFc3r4zuxC01dXjBGLVhKKzOMF1lGRMZfzMiP45SP39VoFCMeOFD9XsU/tc6tqNyJc5sMoYYX/+MW6m+N6hrC+s6RRIrY3WisjGj3+/R4elivnqrpnhRROCj+i2je2w8aO+48c8fvCu9UvcD7tiaG/92hTUsY+HtyXbxujg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9nvM3iY+Prcb5FORfjI4WVoI++cmP+ZsJ78var6NgUw=; b=EaQF+cObt6LXu/AtRZCORWbRYwLzBWKUKGRdwvggVUW+Z6gZujEcBHbiPyvJP6UG28eIlzKPbjGtg85iy6EySVNXlchIIGf/iQQKAyMFSMvxiddXw3UP7iZ6PDV87Bz5czyWGKy3uEPt998JhPDqRWJftWGvhJanKOyshgfaeDQrnd+VKCwKVJs8MmysajAD15sgnhvgVjS+q8Aw8dZg3bdQ3lW9u+CEG6nYZFhlIZoIdDqNXorW61JS3B+xs4wCH5FoBcJeulgXsnqP86j9EWQf7FLzfHHCNhVR4fd0iPhig4o8FqDxUKFekHOjD5XJlUxvoj8gwnUMB5E7m7WXqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8285.eurprd04.prod.outlook.com (2603:10a6:102:1ca::15) by PA2PR04MB10186.eurprd04.prod.outlook.com (2603:10a6:102:404::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8251.16; Fri, 13 Dec 2024 06:03:42 +0000 Received: from PAXPR04MB8285.eurprd04.prod.outlook.com ([fe80::e003:8fb:64ea:acfd]) by PAXPR04MB8285.eurprd04.prod.outlook.com ([fe80::e003:8fb:64ea:acfd%6]) with mapi id 15.20.8251.015; Fri, 13 Dec 2024 06:03:41 +0000 From: Hou Qi To: libcamera-devel@lists.libcamera.org Cc: jared.hu@nxp.com, qi.hou@nxp.com, julien.vuillaumier@nxp.com Subject: [PATCH v2] gstreamer: keep same transfer with that in negotiated caps Date: Fri, 13 Dec 2024 15:03:19 +0900 Message-Id: <20241213060319.2877936-1-qi.hou@nxp.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: JH0PR01CA0136.apcprd01.prod.exchangelabs.com (2603:1096:990:5b::12) To PAXPR04MB8285.eurprd04.prod.outlook.com (2603:10a6:102:1ca::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8285:EE_|PA2PR04MB10186:EE_ X-MS-Office365-Filtering-Correlation-Id: ac34df83-d952-442c-8c54-08dd1b3be4e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: kEDUGsaNn4TsjZyCpwAmAZ4mzR99jxGca0UsfSK+kUWGH1d4hva/LbLQiQCixLFoln7quqjNJ4vnAUxgQ8IeSwYvgsGCNMdOHgHmrJ7SfHX+mkxhOpxZy0RW6KwjAZs81CHOARifTBgG9ngGj+vMRcGu6QdqQdK1YhYD+0jZRZbU4bykC/pziG9Iy3AH1YPrdarvl93CT7KNvbVHCFhnKGPlgPOnvb9mo1r/7VsvZ6Huf/iDo7oDmvACCStQEovFgjmqXrTPV3c9+YPI08c3UsN2OsQo06QTTi2LHYEjS5Sttt/AehiQHEu6TufTG7DGcrRVngGuO14rBW8IJyaVvI48wkKuMxeT2Vjhy1LKxRNo/mlJJO4NAeQiTeBPaaXcX2NBz4Ec1r8ST6FPZNaD6BdizrJUdi1oF0CHlx9kEUc/V/XUDUVcmBcf+H7Eij5uAkwZs1+/QAwSF13jjzO5T5KaH1U8xLbpU82yvwITFXY+XCl+owUpgFWWocrSMraahBemUaVqX5yFPzfjL0SKIDsiQU9v5eZ1kX63UWqaDzz67fwni+8WxaOjgheO06q8XMHRwtw3NhJATUDbTtrmDarlVoGMAnsPtDPIWiX7BO/noqZ5QAVQ/YWbNWtBuyXwsO/7WTQ1F8aB+GI92FmAZTOOWfeX+Nsp9oKWsCROcZAdRCTKrxgfrDCbYb00kKeWK0RQyoXtwl4BFXGwizRFhYhTFQgCnDfU0MKFMjvxBv2Wo+TjoZVaA4Ac9jiFGsNBEZjnBs45LRYFqXe63/gfdVAYZveW3AQ9qcDjF5FSzp/l2qJiqLbrE17pTwhITFzbdLh8JyEtP6uxY3qupHlESfax/RV04+pqzixRV3HNEwpM1paCSTvLxVslC2WQZiRSecAxfgK2Y6sxcsdKWaqPgTTaabQoASWDQp1Ya5w4adffMqY0TI9mA3DLlhPvAZpLRyb2Q0Jccxh/nArRYhZBibbwmHyr7Ujj6qVmOpF2Vw9hM9jbZJLIeD59pnSiAcUdO1VgdDYEkZi7Gav1ksDixX5gpkXTjOzWMYOIjZrcPK0Xd7fLCQCMIfUUvNAQgOjiAprmVpqcNwKenZ/oWNbuxftXnnuIFrNldYXWm9CdasH46/s6HQ5fRcdpg2QoBsBhL5cKTTz3vcr+SzbzLK7n/oWEPEcB8bJLjuDhpbm4dz3p6tyIBALv5j7jrAb9trOmQXlYDdGGuGBKfKHtXPuiKXinpm7GZPWy/KBXv5E5tRXO1OziYW/kyNAchUc376AHbQe5qHFF43XaVx7a/kaRBL2F7HhMm7mWh45tSfp9Y0kIfjiTIbKutt674NjBZR9rsg3GZLKFlJhkMDQBE40pLgS4Fsd+pVy9Cll9r7qHzWo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB8285.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YMkwE+zJ6D/yn40t3+zwbjCyOtT2dhrBY81Z2Tdwz41vL+FZYVGAfDTQo+oXLHp+dfcVt/yzL/T8qZms9KvT+8Ie8t288ciyJH542du3bOsqkZ4Vz8ilc2rpqkys2+4USkBkwIOhAW+DjrdI50klYGwp7XwxTbm3FR0m7ivS+zFoXj/H6HbIS6d7yg49eLNWL5Gfha4v4KGJPBobTnba36o9yOTdhq/i4l8VFzohBd0kHPK7JNTeagOKAznB67Zyrv14fDQMcRj22uY0yS1AGJE73UrpujeVfv+3VNR1vL3roItsenyDWp62q/lehLchi9WuXxJ/skBHrh6xPbC3AnXueqpvielE1kjs/sPhy3zxcJ+OL6l8qn3EO0D3JFNxuAvlSzo1hUjAe0vywBI61rYFDD/LHDA2M8+V8zH26onCgpCdpJjf8W0eVQWFeStsvP53g/qV7hNzeslhdwXpNlqgimoQf8EiFl3HRxUGdq82wqLjL2ktZAMMYPIEOeUM5tkDljmyYyTsezF1cOWEVY6Q8icohaK2nccmV5xo8qPkb55RcIpL2C4Xr6qxN8lzxbubrwd3BFVAje2mGnQQBq8Y0HtnNZ8VFh5xtzYc3f2psW6xl3q6x/t5xmMhplpulLjKym9I58qGrHxiSiU7XbRlXqGT/DvTXCvEFryPK05XlAu52azJESouwcdXyycBt4goD1T7j2ywGhnXVyCSTe8wtq67zrVNq6N58GH4UmU4bP4fja/JBO71GKH6bMC9TYiYg5ZVketrDBlAzbAlpB/UyvQjhtG1ZQi5vMDfWX5dJcL/hQJh7qqG1nMiAt2lIpe1x5oRWLUfRBRYsTNZwvuAwn2Kp9UqmvT2tN07rAQc3caDOrR6zSKNY6pA5BfH+0yDsMVTC4ZvVcrP2TZuDyjr69ZcMgG1hlEgS9RsVvw98u3bL+dFVNl/joaMLNObUV2D6n4IdhCWkYCHm6SinrHHraT9sEzVpw9oNwxnt5Rb9rHDDvHZ4t0bEIzqq7bR1yAjo4iq+7vRKaKOimX6QYOexOasyMOnALhL0TLJwXk7G1hbypFrHGeh/4ArOhyTjHImTlG82Jejw+hAgZ7QiqqWZfOCs/jQB3diTtgW/7BrNQAyClq+t7zn0aovdXrhaDgRXTQvnhA+AfH2j21JgdyVflWfl3Hc3YyGuy4q3s9qte58EmjEkzAXHiw/zJXBFPFP5St4IqbT276panqK7/PwTfRi7Kn7lBgV+w6rnl72KMawraaOkkw4Mkk8VZd8gdrCTIPZU4zRKFe8OaVYvJMAUkO6ux81uLWEHDvAXbuIgaiOjVv568JUyJWmqGylEx6A66cfp7Fn7Yb6fK3XiXig/qGJDa3TdsFCXsFVffDxgqWKEH5yAWtiFhaWDrZzrGDUu22U5qLcRcsXGvI6VE5JABdyQYme60kO7PqAwrv0CYZYjGRsxX2JwNFDGI2yNwbh3F7BM7QXKibGqLAkgD7AVF/9kjN12SWAN4qIxHoj+2SpoWi/aYCK2r8zUXIUTlUm8X7SpVi/uEVSuA6cJdP0coues1Ft8X+h+bBSU+k= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac34df83-d952-442c-8c54-08dd1b3be4e4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8285.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2024 06:03:41.8330 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MhX6z+bEK0+cKvHacYuFwWorEjLSUQI8S3McJX1q+P49ngB4Ol3PvB0hK/7VrLJc X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA2PR04MB10186 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The conversions back and forth between GStreamer colorimetry and libcamera color space are not invariant for the bt601 colorimetry. The reason is that Rec709 transfer function defined in GStreamer as GST_VIDEO_TRANSFER_BT709 (5), is to be replaced by its alias GST_VIDEO_TRANSFER_BT601 (16) only for the case of bt601 (aka 2:4:16:4) colorimetry - see [1]. Currently the composition of the GStreamer/libcamera conversions: colorimetry_from_colorspace (colorspace_from_colorimetry (bt601)) returns 2:4:5:4 instead of the expected 2:4:16:4 (bt601). This causes negotiation error when the downstream element explicitly expects bt601 colorimetry. Minimal example to reproduce the issue is with a pipeline handler that do not set the optional color space in the stream configuration, for instance vimc or imx8-isi: export LIBCAMERA_PIPELINES_MATCH_LIST="vimc,imx8-isi" gst-launch-1.0 -v libcamerasrc ! video/x-raw,colorimetry=bt601 ! fakesink Above pipeline fails to start. This change memorizes downstream required transfer function when mapped libcamera transfer is Rec709 in gst_libcamera_configure_stream_from_caps(), and restores the transfer function in gst_libcamera_stream_formats_to_caps(). [1] https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/724 Bug: https://bugs.libcamera.org/show_bug.cgi?id=150 Signed-off-by: Hou Qi Reviewed-by: Nicolas Dufresne Reviewed-by: Laurent Pinchart --- src/gstreamer/gstlibcamera-utils.cpp | 19 +++++++++++-------- src/gstreamer/gstlibcamera-utils.h | 5 +++-- src/gstreamer/gstlibcamerasrc.cpp | 6 ++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index 732987ef..23756b15 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -85,7 +85,7 @@ static struct { }; static GstVideoColorimetry -colorimetry_from_colorspace(const ColorSpace &colorSpace) +colorimetry_from_colorspace(const ColorSpace &colorSpace, GstVideoTransferFunction transfer) { GstVideoColorimetry colorimetry; @@ -113,6 +113,8 @@ colorimetry_from_colorspace(const ColorSpace &colorSpace) break; case ColorSpace::TransferFunction::Rec709: colorimetry.transfer = GST_VIDEO_TRANSFER_BT709; + if (transfer) + colorimetry.transfer = transfer; break; } @@ -144,7 +146,7 @@ colorimetry_from_colorspace(const ColorSpace &colorSpace) } static std::optional -colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry) +colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry, GstVideoTransferFunction *transfer) { std::optional colorspace = ColorSpace::Raw; @@ -188,6 +190,7 @@ colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry) case GST_VIDEO_TRANSFER_BT2020_12: case GST_VIDEO_TRANSFER_BT709: colorspace->transferFunction = ColorSpace::TransferFunction::Rec709; + *transfer = colorimetry.transfer; break; default: GST_WARNING("Colorimetry transfer function %d not mapped in gstlibcamera", @@ -379,7 +382,8 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats) } GstCaps * -gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg) +gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg, + GstVideoTransferFunction transfer) { GstCaps *caps = gst_caps_new_empty(); GstStructure *s = bare_structure_from_format(stream_cfg.pixelFormat); @@ -390,7 +394,7 @@ gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg nullptr); if (stream_cfg.colorSpace) { - GstVideoColorimetry colorimetry = colorimetry_from_colorspace(stream_cfg.colorSpace.value()); + GstVideoColorimetry colorimetry = colorimetry_from_colorspace(stream_cfg.colorSpace.value(), transfer); g_autofree gchar *colorimetry_str = gst_video_colorimetry_to_string(&colorimetry); if (colorimetry_str) @@ -405,9 +409,8 @@ gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg return caps; } -void -gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, - GstCaps *caps) +void gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, + GstCaps *caps, GstVideoTransferFunction *transfer) { GstVideoFormat gst_format = pixel_format_to_gst_format(stream_cfg.pixelFormat); guint i; @@ -495,7 +498,7 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, if (!gst_video_colorimetry_from_string(&colorimetry, colorimetry_str)) g_critical("Invalid colorimetry %s", colorimetry_str); - stream_cfg.colorSpace = colorspace_from_colorimetry(colorimetry); + stream_cfg.colorSpace = colorspace_from_colorimetry(colorimetry, transfer); } } diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h index cab1c814..4978987c 100644 --- a/src/gstreamer/gstlibcamera-utils.h +++ b/src/gstreamer/gstlibcamera-utils.h @@ -16,9 +16,10 @@ #include GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &formats); -GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg); +GstCaps *gst_libcamera_stream_configuration_to_caps(const libcamera::StreamConfiguration &stream_cfg, + GstVideoTransferFunction transfer); void gst_libcamera_configure_stream_from_caps(libcamera::StreamConfiguration &stream_cfg, - GstCaps *caps); + GstCaps *caps, GstVideoTransferFunction *transfer); void gst_libcamera_get_framerate_from_caps(GstCaps *caps, GstStructure *element_caps); void gst_libcamera_clamp_and_set_frameduration(libcamera::ControlList &controls, const libcamera::ControlInfoMap &camera_controls, diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index 8efa25f4..0f0d501e 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -433,12 +433,14 @@ static bool gst_libcamera_src_negotiate(GstLibcameraSrc *self) { GstLibcameraSrcState *state = self->state; + GstVideoTransferFunction transfer[state->srcpads_.size()]; g_autoptr(GstStructure) element_caps = gst_structure_new_empty("caps"); for (gsize i = 0; i < state->srcpads_.size(); i++) { GstPad *srcpad = state->srcpads_[i]; StreamConfiguration &stream_cfg = state->config_->at(i); + transfer[i] = GST_VIDEO_TRANSFER_UNKNOWN; /* Retrieve the supported caps. */ g_autoptr(GstCaps) filter = gst_libcamera_stream_formats_to_caps(stream_cfg.formats()); @@ -448,7 +450,7 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) /* Fixate caps and configure the stream. */ caps = gst_caps_make_writable(caps); - gst_libcamera_configure_stream_from_caps(stream_cfg, caps); + gst_libcamera_configure_stream_from_caps(stream_cfg, caps, &transfer[i]); gst_libcamera_get_framerate_from_caps(caps, element_caps); } @@ -476,7 +478,7 @@ gst_libcamera_src_negotiate(GstLibcameraSrc *self) GstPad *srcpad = state->srcpads_[i]; const StreamConfiguration &stream_cfg = state->config_->at(i); - g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg); + g_autoptr(GstCaps) caps = gst_libcamera_stream_configuration_to_caps(stream_cfg, transfer[i]); gst_libcamera_framerate_to_caps(caps, element_caps); if (!gst_pad_push_event(srcpad, gst_event_new_caps(caps)))