{"id":9950,"url":"https://patchwork.libcamera.org/api/patches/9950/?format=json","web_url":"https://patchwork.libcamera.org/patch/9950/","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":"<20201005104649.10812-4-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:37","name":"[libcamera-devel,03/15] android: camera_stream: Delegate Encoder construction","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"87dfaec4474685cc24a6efdff6325d73a0d1c976","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9950/mbox/","series":[{"id":1349,"url":"https://patchwork.libcamera.org/api/series/1349/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1349","date":"2020-10-05T10:46:34","name":"CameraStream refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/1349/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9950/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9950/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 97AD1C3B5D\n\tfor ;\n\tMon, 5 Oct 2020 10:47:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AD38E63C48;\n\tMon, 5 Oct 2020 12:47:37 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0C9F63B27\n\tfor ;\n\tMon, 5 Oct 2020 12:47:34 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 49AAB59E;\n\tMon, 5 Oct 2020 12:47:34 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"WLclBpEl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894854;\n\tbh=berp9T5tcX7IOm2p8Q9u0T8CRn9Ed9OI/Ti1r51BiII=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WLclBpElylXfgEUeFs8GLSEBmvE5oxmRjnEvuaNNGyUAus/Wx3b5cRpPcVcLZUvQN\n\t+si8dlnpBq59wMmb1cLWZthaTGn0IritnKi1djmtuJcGK8vqEQvUrsOsC6pbjxjH4y\n\tWuUNUPEC7X0K2lC0obbH78bpAPzF/Gu+yc8ifhI8=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:37 +0300","Message-Id":"<20201005104649.10812-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 03/15] 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":"From: Jacopo Mondi \n\nDelegate the construction of the encoder to the CameraStream class\nfor streams that need post-processing.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 23 ++++++++++-------------\n src/android/camera_stream.cpp | 17 ++++++++++++++---\n src/android/camera_stream.h | 4 +++-\n 3 files changed, 27 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 585bf2b68f4f..5b2b625c563b 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -7,10 +7,21 @@\n \n #include \"camera_stream.h\"\n \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), encoder(nullptr)\n {\n+\tif (type_ == Type::Internal || type_ == Type::Mapped)\n+\t\tencoder_.reset(new EncoderLibJpeg);\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 07c714e3a365..d0dc40d81151 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","03/15"]}