{"id":9972,"url":"https://patchwork.libcamera.org/api/patches/9972/?format=json","web_url":"https://patchwork.libcamera.org/patch/9972/","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":"<20201006144432.22908-4-jacopo@jmondi.org>","date":"2020-10-06T14:44:22","name":"[libcamera-devel,v2,03/13] android: camera_stream: Delegate Encoder construction","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4cc2656a3cfa4bd9a3899026c86b9420d33284d0","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/9972/mbox/","series":[{"id":1356,"url":"https://patchwork.libcamera.org/api/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/9972/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9972/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 7A06DBEEDF\n\tfor ;\n\tTue, 6 Oct 2020 14:40:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 56B7563C9F;\n\tTue, 6 Oct 2020 16:40:44 +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 F102863C13\n\tfor ;\n\tTue, 6 Oct 2020 16:40:42 +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 AB09760002;\n\tTue, 6 Oct 2020 14:40:41 +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:22 +0200","Message-Id":"<20201006144432.22908-4-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 03/13] android: camera_stream: Delegate\n\tEncoder construction","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":"Delegate the construction of the encoder to the CameraStream class\nfor streams that need post-processing.\n\nReviewed-by: Umang Jain \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 23 ++++++++++-------------\n src/android/camera_stream.cpp | 16 +++++++++++++---\n src/android/camera_stream.h | 4 +++-\n 3 files changed, 26 insertions(+), 17 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 0600ebc81c64..9c9a5cfa3c2f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1273,19 +1273,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \n \t\tStreamConfiguration &cfg = config_->at(index);\n \n-\t\t/*\n-\t\t * Construct a software encoder for the MJPEG streams from the\n-\t\t * chosen libcamera source stream.\n-\t\t */\n-\t\tEncoder *encoder = new EncoderLibJpeg();\n-\t\tint ret = encoder->configure(cfg);\n-\t\tif (ret) {\n-\t\t\tLOG(HAL, Error) << \"Failed to configure encoder\";\n-\t\t\tdelete encoder;\n-\t\t\treturn ret;\n-\t\t}\n-\n-\t\tstreams_.emplace_back(formats::MJPEG, cfg.size, type, index, encoder);\n+\t\tstreams_.emplace_back(formats::MJPEG, cfg.size, type, index);\n \t\tjpegStream->priv = static_cast(&streams_.back());\n \t}\n \n@@ -1306,11 +1294,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\treturn -EINVAL;\n \t}\n \n+\t/*\n+\t * Configure the HAL CameraStream instances using the associated\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\tStreamConfiguration &cfg = config_->at(cameraStream->index());\n \n+\t\tint ret = cameraStream->configure(cfg);\n+\t\tif (ret)\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}\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 7205721dbeb9..2d0c6ff99ac6 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -8,11 +8,21 @@\n #include \"camera_stream.h\"\n \n #include \"jpeg/encoder.h\"\n+#include \"jpeg/encoder_libjpeg.h\"\n \n using namespace libcamera;\n \n-CameraStream::CameraStream(PixelFormat format, Size size,\n-\t\t\t Type type, unsigned int index, Encoder *encoder)\n-\t: format_(format), size_(size), type_(type), index_(index), encoder_(encoder)\n+CameraStream::CameraStream(PixelFormat format, Size size, Type type, unsigned int index)\n+\t: format_(format), size_(size), type_(type), index_(index)\n {\n+\tif (type_ == Type::Internal || type_ == Type::Mapped)\n+\t\tencoder_ = std::make_unique();\n+}\n+\n+int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n+{\n+\tif (encoder_)\n+\t\treturn encoder_->configure(cfg);\n+\n+\treturn 0;\n }\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex e54276868a19..2f49d3d41a7f 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -100,7 +100,7 @@ public:\n \t\tMapped,\n \t};\n \tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n-\t\t Type type, unsigned int index, Encoder *encoder = nullptr);\n+\t\t Type type, unsigned int index);\n \n \tconst libcamera::PixelFormat &format() const { return format_; }\n \tconst libcamera::Size &size() const { return size_; }\n@@ -108,6 +108,8 @@ public:\n \tunsigned int index() const { return index_; }\n \tEncoder *encoder() const { return encoder_.get(); }\n \n+\tint configure(const libcamera::StreamConfiguration &cfg);\n+\n private:\n \tlibcamera::PixelFormat format_;\n \tlibcamera::Size size_;\n","prefixes":["libcamera-devel","v2","03/13"]}