{"id":16916,"url":"https://patchwork.libcamera.org/api/patches/16916/?format=json","web_url":"https://patchwork.libcamera.org/patch/16916/","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":"<20220802160136.63075-7-jacopo@jmondi.org>","date":"2022-08-02T16:01:36","name":"[libcamera-devel,v4,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/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16916/mbox/","series":[{"id":3359,"url":"https://patchwork.libcamera.org/api/series/3359/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3359","date":"2022-08-02T16:01:30","name":"libcamera: Map multiple V4L2 formats to a single libcamera::format","version":4,"mbox":"https://patchwork.libcamera.org/series/3359/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16916/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16916/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 73FEBBE173\n\tfor ;\n\tTue, 2 Aug 2022 16:02:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 31EBE63326;\n\tTue, 2 Aug 2022 18:02:01 +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 6FBCD63312\n\tfor ;\n\tTue, 2 Aug 2022 18:02:00 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id B6BC64000E;\n\tTue, 2 Aug 2022 16:01:58 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659456121;\n\tbh=a433SnA8OhWn23BTMvTpWIFAiX/rnV5LCwM9oiMsoh4=;\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=wnS+UC6tNfi2mUFNvMtvxuyW/ok7M/cznShcyx4K1gOxvnqnIBWtflGc4izIuatU0\n\t9r5MhaiBWns1ggfjtaKGmXChA3Xn0KGuCgh120pXeFO3AliNsGZPdrEwjjzquSnmNB\n\tZ7TFNcOhdqxFV77ZFUg+IqVikjV5Y9DvlCCE46c6SoCEeeMN/hUjzv1YlIm+06SqVW\n\torgU9wdyv4n/jypkBbZ3rp4tCkRSpVu6DhHionowlmBmsl7k6sYAgdxYx0t+4i0CJt\n\tZ2B/fN7202jBJIwESoBgYgoxI+bZYmztqmk+OKNxLxd4/4wiwxEsn8jNWJsb6tMajo\n\tlO9Cv3HRCVUmw==","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 2 Aug 2022 18:01:36 +0200","Message-Id":"<20220802160136.63075-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.37.1","In-Reply-To":"<20220802160136.63075-1-jacopo@jmondi.org>","References":"<20220802160136.63075-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 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 \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 264ca80aab27..8ec442d6b84d 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","v4","6/6"]}