{"id":9470,"url":"https://patchwork.libcamera.org/api/1.1/patches/9470/?format=json","web_url":"https://patchwork.libcamera.org/patch/9470/","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":"<20200902152236.69770-10-jacopo@jmondi.org>","date":"2020-09-02T15:22:33","name":"[libcamera-devel,v2,09/12] android: camera_device: Use Android format","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c4a887b2d0a2e39bd336d0581d309a82f4e432d3","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/9470/mbox/","series":[{"id":1259,"url":"https://patchwork.libcamera.org/api/1.1/series/1259/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1259","date":"2020-09-02T15:22:24","name":"android: camera_device: Fix JPEG/RAW sizes","version":2,"mbox":"https://patchwork.libcamera.org/series/1259/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9470/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9470/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 06F47BF6D3\n\tfor ;\n\tWed, 2 Sep 2020 15:19:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D32D8629E8;\n\tWed, 2 Sep 2020 17:19:10 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 29E8562931\n\tfor ;\n\tWed, 2 Sep 2020 17:19:09 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 0BD73240010;\n\tWed, 2 Sep 2020 15:19:07 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 2 Sep 2020 17:22:33 +0200","Message-Id":"<20200902152236.69770-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200902152236.69770-1-jacopo@jmondi.org>","References":"<20200902152236.69770-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 09/12] android: camera_device: Use\n\tAndroid format","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","Cc":"tfiga@google.com, hiroh@google.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"We assumed HAL_PIXEL_FORMAT_BLOB is always mapped to libcamera::MJPEG\nand at the moment this is true. To protect against future changes in the\nmapping, inspect the Android format instead of the libcamera one.\n\nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 5 ++---\n 1 file changed, 2 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 7fc61e3e4da7..3630e87e8814 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1216,7 +1216,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstream->priv = static_cast(&streams_[i]);\n \n \t\t/* Defer handling of MJPEG streams until all others are known. */\n-\t\tif (format == formats::MJPEG)\n+\t\tif (stream->format == HAL_PIXEL_FORMAT_BLOB)\n \t\t\tcontinue;\n \n \t\tStreamConfiguration streamConfiguration;\n@@ -1230,10 +1230,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t/* Now handle MJPEG streams, adding a new stream if required. */\n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n-\t\tPixelFormat format = toPixelFormat(stream->format);\n \t\tbool match = false;\n \n-\t\tif (format != formats::MJPEG)\n+\t\tif (stream->format != HAL_PIXEL_FORMAT_BLOB)\n \t\t\tcontinue;\n \n \t\t/* Search for a compatible stream */\n","prefixes":["libcamera-devel","v2","09/12"]}