{"id":9456,"url":"https://patchwork.libcamera.org/api/1.1/patches/9456/?format=json","web_url":"https://patchwork.libcamera.org/patch/9456/","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":"<20200902130846.55910-4-jacopo@jmondi.org>","date":"2020-09-02T13:08:42","name":"[libcamera-devel,RFC,3/7] android: camera_device: Check correct stream format","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"3c9208fb5342c9f28e327dd4a0848143b83a3537","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/9456/mbox/","series":[{"id":1258,"url":"https://patchwork.libcamera.org/api/1.1/series/1258/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1258","date":"2020-09-02T13:08:39","name":"android: camera_device: Turn CameraStream into a class","version":1,"mbox":"https://patchwork.libcamera.org/series/1258/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9456/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9456/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 72E53BF019\n\tfor ;\n\tWed, 2 Sep 2020 13:05:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4E322629C7;\n\tWed, 2 Sep 2020 15:05:14 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 186F360374\n\tfor ;\n\tWed, 2 Sep 2020 15:05:13 +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 relay11.mail.gandi.net (Postfix) with ESMTPSA id 87153100008;\n\tWed, 2 Sep 2020 13:05:11 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 2 Sep 2020 15:08:42 +0200","Message-Id":"<20200902130846.55910-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200902130846.55910-1-jacopo@jmondi.org>","References":"<20200902130846.55910-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [RFC 3/7] android: camera_device: Check correct\n\tstream 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":"When iterating the camera3_stream_t received from the Android camera\nframework to identify the MJPEG streams, the format check was performed\non the CameraStream created when iterating the non-MJPEG streams and not\non the format actually requested by Android.\n\nFix this by checking the camera3_stream format.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 5a70db832aa5..01f4b3a45566 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1230,9 +1230,10 @@ 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 (streams_[i].format != formats::MJPEG)\n+\t\tif (format != formats::MJPEG)\n \t\t\tcontinue;\n \n \t\t/* Search for a compatible stream */\n","prefixes":["libcamera-devel","RFC","3/7"]}