{"id":9473,"url":"https://patchwork.libcamera.org/api/1.1/patches/9473/?format=json","web_url":"https://patchwork.libcamera.org/patch/9473/","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":"<20200902152236.69770-13-jacopo@jmondi.org>","date":"2020-09-02T15:22:36","name":"[libcamera-devel,v2,12/12] android: camera_device: Make CameraStream a class","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3abd0dc4556e473345955b78497327108facaef3","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/9473/mbox/","series":[{"id":1259,"url":"https://patchwork.libcamera.org/api/1.1/series/1259/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1259","date":"2020-09-02T15:22:24","name":"android: camera_device: Fix JPEG/RAW sizes","version":2,"mbox":"https://patchwork.libcamera.org/series/1259/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9473/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9473/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 C76EEBE174\n\tfor ;\n\tWed, 2 Sep 2020 15:19:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1D12629B2;\n\tWed, 2 Sep 2020 17:19:14 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 13A78629E6\n\tfor ;\n\tWed, 2 Sep 2020 17:19:13 +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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id E4E5F240016;\n\tWed, 2 Sep 2020 15:19:11 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 2 Sep 2020 17:22:36 +0200","Message-Id":"<20200902152236.69770-13-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200902152236.69770-1-jacopo@jmondi.org>","References":"<20200902152236.69770-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 12/12] android: camera_device: Make\n\tCameraStream a class","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":"tfiga@google.com, hiroh@google.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Complete the transformation of CameraStream into a class and provide\na read-only interface that allows to access its parameters but not\nmodify them at run-time.\n\nNo functional changes intended but this change aims to make the code\nmore robust by enforcing a stricter interface in the CameraStream class.\n\nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 9 +++++----\n src/android/camera_device.h | 14 ++++++++------\n 2 files changed, 13 insertions(+), 10 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 28d8e081eab0..88c85ad183d2 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -168,8 +168,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n \t}\n }\n \n-CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *encoder)\n-\t: format(f), size(s), index_(i), encoder_(encoder)\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@@ -1415,7 +1416,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n \n \t\t/* Software streams are handled after hardware streams complete. */\n-\t\tif (cameraStream->format == formats::MJPEG)\n+\t\tif (cameraStream->format() == formats::MJPEG)\n \t\t\tcontinue;\n \n \t\t/*\n@@ -1479,7 +1480,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\tCameraStream *cameraStream =\n \t\t\tstatic_cast(descriptor->buffers[i].stream->priv);\n \n-\t\tif (cameraStream->format != formats::MJPEG)\n+\t\tif (cameraStream->format() != formats::MJPEG)\n \t\t\tcontinue;\n \n \t\tEncoder *encoder = cameraStream->encoder();\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 3c57ffec265d..729b2556011b 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -27,19 +27,21 @@\n \n class CameraMetadata;\n \n-struct CameraStream {\n+class CameraStream\n+{\n public:\n-\tCameraStream(libcamera::PixelFormat, libcamera::Size, unsigned int i,\n-\t\t Encoder *encoder = nullptr);\n+\tCameraStream(libcamera::PixelFormat format, libcamera::Size size,\n+\t\t unsigned int index, Encoder *encoder = nullptr);\n \t~CameraStream();\n \n+\tlibcamera::PixelFormat format() const { return format_; }\n+\tlibcamera::Size size() const { return size_; }\n \tunsigned int index() const { return index_; }\n \tEncoder *encoder() const { return encoder_; }\n \n-\tlibcamera::PixelFormat format;\n-\tlibcamera::Size size;\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","prefixes":["libcamera-devel","v2","12/12"]}