{"id":16933,"url":"https://patchwork.libcamera.org/api/patches/16933/?format=json","web_url":"https://patchwork.libcamera.org/patch/16933/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220803103849.26144-8-jacopo@jmondi.org>","date":"2022-08-03T10:38:49","name":"[libcamera-devel,v5,7/7] 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/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16933/mbox/","series":[{"id":3365,"url":"https://patchwork.libcamera.org/api/series/3365/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3365","date":"2022-08-03T10:38:42","name":"libcamera: Map multiple V4L2 formats to a single libcamera::format","version":5,"mbox":"https://patchwork.libcamera.org/series/3365/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16933/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16933/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 EC6ABBE173\n\tfor ;\n\tWed, 3 Aug 2022 10:39:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BC7CE63325;\n\tWed, 3 Aug 2022 12:39:09 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::225])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 40FE463310\n\tfor ;\n\tWed, 3 Aug 2022 12:39:08 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 155C11C0003;\n\tWed, 3 Aug 2022 10:39:06 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659523149;\n\tbh=iedALra/qDBzxP9ptFkvgqY3VnntJu0nfTu75a8zYgE=;\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:\n\tFrom;\n\tb=TNcxZBUnojE4oGE+d/ic/HjSKqT1qcEQN7K7vjzGve4Fs3eeWTO9UFSV8DG5AdZc3\n\tShCwayNWfbSxULHBYZrrV2qXy+v/5HXG088gby98HXeR/4k/tKJ9kGWv91OLC5QcZ/\n\tr15028YzXPOJDbrhmqUF19kDT3vDz45vFWYKkjXjkjG53XYjJW46WQ+q1cfgMeow2z\n\tnKCyJLoc0i8EYnPAqj9Yj+EdUsyOnI7+H8n1hUMCGXbtiywgaxCNFkj6r1CubtVaRc\n\tjgJU7tGThcnZ6iCfst04UKzieiHrrtDsvf5MZF/So5wpdo8PFPPPper0ZLpn2E9QmV\n\ty1NDOW0uoZejA==","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 3 Aug 2022 12:38:49 +0200","Message-Id":"<20220803103849.26144-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.37.1","In-Reply-To":"<20220803103849.26144-1-jacopo@jmondi.org>","References":"<20220803103849.26144-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 7/7] 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 ","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 \nReviewed-by: Laurent Pinchart \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 b760ec0eff82..4746d38c30d2 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 90c8fa8d9aae..ca05de6c0b4a 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","v5","7/7"]}