{"id":9587,"url":"https://patchwork.libcamera.org/api/1.1/patches/9587/?format=json","web_url":"https://patchwork.libcamera.org/patch/9587/","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":"<20200912101129.12625-8-jacopo@jmondi.org>","date":"2020-09-12T10:11:26","name":"[libcamera-devel,v4,07/10] android: camera_device: Use Android format","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"70c7f07b6e5caa20929b5b25b863a3131a4cc491","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/9587/mbox/","series":[{"id":1287,"url":"https://patchwork.libcamera.org/api/1.1/series/1287/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1287","date":"2020-09-12T10:11:19","name":"android: camera_device: Fix JPEG/RAW sizes","version":4,"mbox":"https://patchwork.libcamera.org/series/1287/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9587/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9587/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 C8410C3B5B\n\tfor ;\n\tSat, 12 Sep 2020 10:08:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A5E8E62DFF;\n\tSat, 12 Sep 2020 12:08:07 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B279062D27\n\tfor ;\n\tSat, 12 Sep 2020 12:08:06 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 0CC351BF206;\n\tSat, 12 Sep 2020 10:08:04 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 12 Sep 2020 12:11:26 +0200","Message-Id":"<20200912101129.12625-8-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200912101129.12625-1-jacopo@jmondi.org>","References":"<20200912101129.12625-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 07/10] 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":"hanlinchen@chromium.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","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. As the next patches will\nremove the creation of CameraStream instances for MJPEG streams, use the\ncamera3_stream format to prepare for that.\n\nReviewed-by: Hirokazu Honda \nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e2c73ff4c4ce..af2905007b28 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1211,7 +1211,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@@ -1228,7 +1228,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n \t\tbool match = false;\n \n-\t\tif (streams_[i].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","v4","07/10"]}