{"id":16645,"url":"https://patchwork.libcamera.org/api/patches/16645/?format=json","web_url":"https://patchwork.libcamera.org/patch/16645/","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":"<20220715135007.53574-8-jacopo@jmondi.org>","date":"2022-07-15T13:50:07","name":"[libcamera-devel,7/7] libcamera: formats: Map V4L2_PIX_FMT_JPEG to formats::MJPEG","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"855e6cb2f0a6a06af378c75ba5927c1c7f3d6a84","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/16645/mbox/","series":[{"id":3288,"url":"https://patchwork.libcamera.org/api/series/3288/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3288","date":"2022-07-15T13:50:00","name":"libcamera: Map multiple V4L2 formats to a single libcamera::format","version":1,"mbox":"https://patchwork.libcamera.org/series/3288/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16645/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16645/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 7B842C3274\n\tfor ;\n\tFri, 15 Jul 2022 13:50:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4329D63325;\n\tFri, 15 Jul 2022 15:50:31 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C25276331A\n\tfor ;\n\tFri, 15 Jul 2022 15:50:28 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 9C91660002;\n\tFri, 15 Jul 2022 13:50:27 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657893031;\n\tbh=aRjSCXAQuNkdIKSUN+wY1r4RD2HhNObZ04hzesEBcgI=;\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=Q5P7GugKxcDyYVX/LHy204EFtCPgHDoETmaqe9hJ3GeyFzuPGoFY2NnUQ7keexTJr\n\tAVzxtl9eYGs/f1DP39dkQV1VCKzssxNEAsgt3DKdgQxJoSH5NL/A1heovbzz2Upc1a\n\tLlSE5bmuWqFsaKNJe4DwVNkYO9sSxnAkA3aFaO8AAxD0xREuwX3dF+8TggyjxQTPXH\n\t084Lfzp62v7HFy5WO2oBBXObS2OwN/QIwK9fQk608P3UjIEtf3VnusaZtNS48/+T6T\n\tSA8kmiCehew8OFNqBvtRrQQbWjgG/cp79L7Cb25d+uPnLdsi8MYZiXf5Wf19ieWP1Q\n\t9S63Otl4x5J6g==","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 15 Jul 2022 15:50:07 +0200","Message-Id":"<20220715135007.53574-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.36.1","In-Reply-To":"<20220715135007.53574-1-jacopo@jmondi.org>","References":"<20220715135007.53574-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 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 ","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 1 file changed, 4 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex 86fc698a0f4e..564ccc1b5a62 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -948,7 +948,10 @@ const std::map pixelFormatInfo{\n \t\t.name = \"MJPEG\",\n \t\t.format = formats::MJPEG,\n \t\t.v4l2Formats = {\n-\t\t\t.single = { V4L2PixelFormat(V4L2_PIX_FMT_MJPEG) },\n+\t\t\t.single = {\n+\t\t\t\t\tV4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n+\t\t\t\t\tV4L2PixelFormat(V4L2_PIX_FMT_JPEG),\n+\t\t\t},\n \t\t\t.multi = { V4L2PixelFormat() },\n \t\t},\n \t\t.bitsPerPixel = 0,\n","prefixes":["libcamera-devel","7/7"]}