{"id":9978,"url":"https://patchwork.libcamera.org/api/1.1/patches/9978/?format=json","web_url":"https://patchwork.libcamera.org/patch/9978/","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":"<20201006144432.22908-10-jacopo@jmondi.org>","date":"2020-10-06T14:44:28","name":"[libcamera-devel,v2,09/13] android: camera_device: Make CameraStream configuration nicer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bc6d8343da49274185f1956a50ecaecc3763b631","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/9978/mbox/","series":[{"id":1356,"url":"https://patchwork.libcamera.org/api/1.1/series/1356/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1356","date":"2020-10-06T14:44:19","name":"CameraStream refactor","version":2,"mbox":"https://patchwork.libcamera.org/series/1356/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9978/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9978/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 77444BEEDF\n\tfor ;\n\tTue, 6 Oct 2020 14:40:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5569463CD8;\n\tTue, 6 Oct 2020 16:40:50 +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 E7C6E63C85\n\tfor ;\n\tTue, 6 Oct 2020 16:40:48 +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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 3839B60006;\n\tTue, 6 Oct 2020 14:40:48 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 6 Oct 2020 16:44:28 +0200","Message-Id":"<20201006144432.22908-10-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201006144432.22908-1-jacopo@jmondi.org>","References":"<20201006144432.22908-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 09/13] android: camera_device: Make\n\tCameraStream configuration nicer","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Loop over the CameraStream instances and use their interface to perform\nCameraStream configuration.\n\nModify CameraStream::configure() to configure the android stream buffer\ncount and to retrieve the StreamConfiguration by index instead of\nreceiving it as a parameter.\n\nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 15 +++++----------\n src/android/camera_stream.cpp | 11 ++++++++---\n src/android/camera_stream.h | 2 +-\n 3 files changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 678dca609003..1e2cbeeb92d1 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1287,17 +1287,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t * StreamConfiguration and set the number of required buffers in\n \t * the Android camera3_stream_t.\n \t */\n-\tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n-\t\tcamera3_stream_t *stream = stream_list->streams[i];\n-\t\tCameraStream *cameraStream = static_cast(stream->priv);\n-\t\tconst StreamConfiguration &cfg = cameraStream->configuration();\n-\n-\t\tint ret = cameraStream->configure(cfg);\n-\t\tif (ret)\n+\tfor (CameraStream &cameraStream : streams_) {\n+\t\tint ret = cameraStream.configure();\n+\t\tif (ret) {\n+\t\t\tLOG(HAL, Error) << \"Failed to configure camera stream\";\n \t\t\treturn ret;\n-\n-\t\t/* Use the bufferCount confirmed by the validation process. */\n-\t\tstream->max_buffers = cfg.bufferCount;\n+\t\t}\n \t}\n \n \t/*\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 3946a2cdf844..f899be4fe007 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -38,10 +38,15 @@ Stream *CameraStream::stream() const\n \treturn configuration().stream();\n }\n \n-int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n+int CameraStream::configure()\n {\n-\tif (encoder_)\n-\t\treturn encoder_->configure(cfg);\n+\tif (encoder_) {\n+\t\tint ret = encoder_->configure(configuration());\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\tcamera3Stream_->max_buffers = configuration().bufferCount;\n \n \treturn 0;\n }\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex f46cfd605d03..4c51f0fb3393 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -114,7 +114,7 @@ public:\n \tconst libcamera::StreamConfiguration &configuration() const;\n \tlibcamera::Stream *stream() const;\n \n-\tint configure(const libcamera::StreamConfiguration &cfg);\n+\tint configure();\n \tint process(const libcamera::FrameBuffer &source,\n \t\t MappedCamera3Buffer *dest, CameraMetadata *metadata);\n \n","prefixes":["libcamera-devel","v2","09/13"]}