{"id":9948,"url":"https://patchwork.libcamera.org/api/patches/9948/?format=json","web_url":"https://patchwork.libcamera.org/patch/9948/","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-2-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:35","name":"[libcamera-devel,01/15] android: camera_stream: Break out CameraStream","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"48e776df4f0c563f3c130368dcb9d9a6626e0b71","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/9948/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/9948/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9948/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 EC65AC3B5D\n\tfor ;\n\tMon, 5 Oct 2020 10:47:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D80A563BD5;\n\tMon, 5 Oct 2020 12:47:35 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0249C63B27\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 7D04A59E;\n\tMon, 5 Oct 2020 12:47:33 +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=\"M9w+PjMN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894853;\n\tbh=MBaQ+et0K8HbJyUJ2dRExPCSZ6HjSHpAQg3PQ9uM3Zk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=M9w+PjMNu+rl/eM0XTo4yRWt7/x847EFmPK38LTBj14jLEiZPuvxNSwHSjUda01ZK\n\tEbJmSb6zZMklIS+WL3p2MbRHNf4ML/ZlrvAwGz/860twaLVXO+YOuu1lJpx7b3Pl6e\n\tpyhAGkZuc3oZE5uTvFhUC0oDRrbuBTgFVmvmaL6Y=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:35 +0300","Message-Id":"<20201005104649.10812-2-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 01/15] android: camera_stream: Break out\n\tCameraStream","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\nBreak CameraStream out of the CameraDevice class.\n\nNo functional changes, only the code is moved.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 6 ------\n src/android/camera_device.h | 24 +--------------------\n src/android/camera_stream.cpp | 16 ++++++++++++++\n src/android/camera_stream.h | 40 +++++++++++++++++++++++++++++++++++\n src/android/meson.build | 1 +\n 5 files changed, 58 insertions(+), 29 deletions(-)\n create mode 100644 src/android/camera_stream.cpp\n create mode 100644 src/android/camera_stream.h","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 751699cd2113..bbc692fe109f 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -169,12 +169,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n \t}\n }\n \n-CameraStream::CameraStream(PixelFormat format, Size size,\n-\t\t\t unsigned int index, Encoder *encoder)\n-\t: format_(format), size_(size), index_(index), encoder_(encoder)\n-{\n-}\n-\n /*\n * \\struct Camera3RequestDescriptor\n *\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 1837748d2efc..52923ec979a7 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -23,33 +23,11 @@\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/message.h\"\n \n+#include \"camera_stream.h\"\n #include \"jpeg/encoder.h\"\n \n class CameraMetadata;\n \n-class CameraStream\n-{\n-public:\n-\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n-\t\t unsigned int index, Encoder *encoder = nullptr);\n-\n-\tconst libcamera::PixelFormat &format() const { return format_; }\n-\tconst libcamera::Size &size() const { return size_; }\n-\tunsigned int index() const { return index_; }\n-\tEncoder *encoder() const { return encoder_.get(); }\n-\n-private:\n-\tlibcamera::PixelFormat format_;\n-\tlibcamera::Size size_;\n-\t/*\n-\t * The index of the libcamera StreamConfiguration as added during\n-\t * configureStreams(). A single libcamera Stream may be used to deliver\n-\t * one or more streams to the Android framework.\n-\t */\n-\tunsigned int index_;\n-\tstd::unique_ptr encoder_;\n-};\n-\n class CameraDevice : protected libcamera::Loggable\n {\n public:\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nnew file mode 100644\nindex 000000000000..01c62978ca3a\n--- /dev/null\n+++ b/src/android/camera_stream.cpp\n@@ -0,0 +1,16 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * camera_stream.cpp - Camera HAL stream\n+ */\n+\n+#include \"camera_stream.h\"\n+\n+using namespace libcamera;\n+\n+CameraStream::CameraStream(PixelFormat format, Size size,\n+\t\t\t unsigned int index, Encoder *encoder)\n+\t: format_(format), size_(size), index_(index), encoder_(encoder)\n+{\n+}\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nnew file mode 100644\nindex 000000000000..10dece7beb69\n--- /dev/null\n+++ b/src/android/camera_stream.h\n@@ -0,0 +1,40 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * camera_stream.h - Camera HAL stream\n+ */\n+#ifndef __ANDROID_CAMERA_STREAM_H__\n+#define __ANDROID_CAMERA_STREAM_H__\n+\n+#include \n+\n+#include \n+#include \n+\n+#include \"jpeg/encoder.h\"\n+\n+class CameraStream\n+{\n+public:\n+\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n+\t\t unsigned int index, Encoder *encoder = nullptr);\n+\n+\tconst libcamera::PixelFormat &format() const { return format_; }\n+\tconst libcamera::Size &size() const { return size_; }\n+\tunsigned int index() const { return index_; }\n+\tEncoder *encoder() const { return encoder_.get(); }\n+\n+private:\n+\tlibcamera::PixelFormat format_;\n+\tlibcamera::Size size_;\n+\t/*\n+\t * The index of the libcamera StreamConfiguration as added during\n+\t * configureStreams(). A single libcamera Stream may be used to deliver\n+\t * one or more streams to the Android framework.\n+\t */\n+\tunsigned int index_;\n+\tstd::unique_ptr encoder_;\n+};\n+\n+#endif /* __ANDROID_CAMERA_STREAM__ */\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 0293c2036561..802bb89afe57 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -20,6 +20,7 @@ android_hal_sources = files([\n 'camera_device.cpp',\n 'camera_metadata.cpp',\n 'camera_ops.cpp',\n+ 'camera_stream.cpp',\n 'jpeg/encoder_libjpeg.cpp',\n 'jpeg/exif.cpp',\n ])\n","prefixes":["libcamera-devel","01/15"]}