{"id":16875,"url":"https://patchwork.libcamera.org/api/1.1/patches/16875/?format=json","web_url":"https://patchwork.libcamera.org/patch/16875/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220729160014.101503-7-jacopo@jmondi.org>","date":"2022-07-29T16:00:14","name":"[libcamera-devel,v3,6/6] libcamera: formats: Map V4L2_PIX_FMT_JPEG to formats::MJPEG","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4941aadfd76d3fb9dc3bee06507c329880fe6cbd","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16875/mbox/","series":[{"id":3350,"url":"https://patchwork.libcamera.org/api/1.1/series/3350/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3350","date":"2022-07-29T16:00:08","name":"libcamera: Map multiple V4L2 formats to a single libcamera::format","version":3,"mbox":"https://patchwork.libcamera.org/series/3350/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16875/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16875/checks/","tags":{},"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 862A7C3275\n\tfor ;\n\tFri, 29 Jul 2022 16:00:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 465CC6331A;\n\tFri, 29 Jul 2022 18:00:34 +0200 (CEST)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::222])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 905166330E\n\tfor ;\n\tFri, 29 Jul 2022 18:00:29 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 715F440008;\n\tFri, 29 Jul 2022 16:00:28 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659110434;\n\tbh=/QODu81LljDaB2gLyvWfGIb24sxTTcD1dH3gvTo7OJ0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=NtpMS+qxt361f+Gai86SqUXI1QR8CDqn2gab1iFTEhRJzuwOnQw3X55vkjKaKfstR\n\t0w8jjfsQT2WEMKvBYrcIiRoU/wggvpAcYpz1x/MazyQ7E9KB5/p6l6XVkzSWLL7fo9\n\t7l8itHSdBSiaWvf6q9l0LJyqhu2kG4PuksfJ8uI5pQGV20+lLtdQCVNgB0h/TlxovG\n\tcOEaaC6CwPu38FMH5/Id0SMT0pdjaAfOM1WYcEzm8bx5PDvWIMQ+1lZKX5Kh9a6BnY\n\td7+DY1osRgL/YtWb2gLEfSrBSgfoW9NlUpp7+0TJnH76cM7EBZqED5yQ3qNwl2/HKU\n\tRbfGByMFLKLPQ==","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 29 Jul 2022 18:00:14 +0200","Message-Id":"<20220729160014.101503-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.37.1","In-Reply-To":"<20220729160014.101503-1-jacopo@jmondi.org>","References":"<20220729160014.101503-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"jozef@mlich.cz, Pavel Machek ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The V4L2_PIX_FMT_JPEG and V4L2_PIX_FMT_MJPEG formats are under-specified\nand are used interchangeably by kernel drivers.\n\nMap both of them to formats::MJPEG and use the newly re-introduced\nV4L2VideoDevice::toV4L2PixelFormat() to map to the one actually used by\nthe video device.\n\nSigned-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(-)","diff":"diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex 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,\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex 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 */\n","prefixes":["libcamera-devel","v3","6/6"]}