[{"id":24252,"web_url":"https://patchwork.libcamera.org/comment/24252/","msgid":"","date":"2022-07-29T18:41:11","subject":"Re: [libcamera-devel] [PATCH v3 6/6] libcamera: formats: Map\n\tV4L2_PIX_FMT_JPEG to formats::MJPEG","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Fri, Jul 29, 2022 at 06:00:14PM +0200, Jacopo Mondi via libcamera-devel wrote:\n> The V4L2_PIX_FMT_JPEG and V4L2_PIX_FMT_MJPEG formats are under-specified\n> and are used interchangeably by kernel drivers.\n> \n> Map both of them to formats::MJPEG and use the newly re-introduced\n> V4L2VideoDevice::toV4L2PixelFormat() to map to the one actually used by\n> the video device.\n\nThis patches doesn't change usage of toV4L2PixelFormat(), I would drop\n\"and use ...\".\n\nReviewed-by: Laurent Pinchart \n\n> Signed-off-by: Jacopo Mondi \n> ---\n> src/libcamera/formats.cpp | 5 ++++-\n> src/libcamera/v4l2_pixelformat.cpp | 2 ++\n> 2 files changed, 6 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 6921d5c43bcb..ff77ab23dda7 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -785,7 +785,10 @@ const std::map pixelFormatInfo{\n> \t{ formats::MJPEG, {\n> \t\t.name = \"MJPEG\",\n> \t\t.format = formats::MJPEG,\n> -\t\t.v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), },\n> +\t\t.v4l2Formats = {\n> +\t\t\tV4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> +\t\t\tV4L2PixelFormat(V4L2_PIX_FMT_JPEG),\n> +\t\t},\n> \t\t.bitsPerPixel = 0,\n> \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> \t\t.packed = false,\n> diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> index bca97d1e3b4f..6abd2fa18312 100644\n> --- a/src/libcamera/v4l2_pixelformat.cpp\n> +++ b/src/libcamera/v4l2_pixelformat.cpp\n> @@ -183,6 +183,8 @@ const std::map vpf2pf{\n> \t/* Compressed formats. */\n> \t{ V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> \t\t{ formats::MJPEG, \"Motion-JPEG\" } },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_JPEG),\n> +\t\t{ formats::MJPEG, \"JPEG JFIF\" } },\n> };\n> \n> } /* namespace */","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 50C51C3275\n\tfor ;\n\tFri, 29 Jul 2022 18:41:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EA20763312;\n\tFri, 29 Jul 2022 20:41:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E2E66603EC\n\tfor ;\n\tFri, 29 Jul 2022 20:41:14 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 739A56D4;\n\tFri, 29 Jul 2022 20:41:14 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659120077;\n\tbh=MOOZE5/7VJuvoiXhnmtt9nuo54omXQ7Y1132qNanIBQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=YUO3neWz9IIYf9V4GOKw4sj1s3/V/cSuwIFuwr8nhFQQOBY7wUeVC6Mux0jsZnwzv\n\tcjm47iot0PYtIH9geR/UzR4gDh/ltktElK19wtnNIie+VG+iH4ADh4inZZUaJB9L3H\n\taGE9vVQ7tuu8vyweELg6VqP5eyS3MkH2DeO6xGFGf2GkSVDOpwDV2I5b/G1+RBQ4XI\n\tmCUXED2FT9LYV/Vpu2nhyIsGKrVGUPnCigcBTZq0/oKW4DLjp+4d79QMOo9HcPZYD7\n\twzSHiNzuohxWibjrQczuG5QcDb4twyvRYh2wdMOEuSlGyDEOAkqAzj+UBW4Eg7TDfI\n\tBuaheWkwkk0eQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659120074;\n\tbh=MOOZE5/7VJuvoiXhnmtt9nuo54omXQ7Y1132qNanIBQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=NS3GRtrJj8iDvTMzCfQp/EDErDdBAddZmMxK7cNDPuEX3syol2pqqu80cftyRWvFA\n\tcrtnhoMOh7CwKCsR1bzIQ1oLKlm0M7m5xCh49JXpVfG7Hie2RtI4+de+g2rob2AiYp\n\tMMYcVwUy9FjXqDC7FDmApMz0z4ZXO6B0HSxPjugA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"NS3GRtrJ\"; dkim-atps=neutral","Date":"Fri, 29 Jul 2022 21:41:11 +0300","To":"Jacopo Mondi ","Message-ID":"","References":"<20220729160014.101503-1-jacopo@jmondi.org>\n\t<20220729160014.101503-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220729160014.101503-7-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v3 6/6] libcamera: formats: Map\n\tV4L2_PIX_FMT_JPEG to formats::MJPEG","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org, jozef@mlich.cz,\n\tPavel Machek ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]