Patch Detail
Show a patch.
GET /api/1.1/patches/9590/?format=api
{ "id": 9590, "url": "https://patchwork.libcamera.org/api/1.1/patches/9590/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9590/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200912101129.12625-11-jacopo@jmondi.org>", "date": "2020-09-12T10:11:29", "name": "[libcamera-devel,v4,10/10] android: camera_device: Make CameraStream a class", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "02fd892aa1d5a9951b52d17dd6d01677b11e574c", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9590/mbox/", "series": [ { "id": 1287, "url": "https://patchwork.libcamera.org/api/1.1/series/1287/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1287", "date": "2020-09-12T10:11:19", "name": "android: camera_device: Fix JPEG/RAW sizes", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1287/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9590/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9590/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 A45CBC3B5B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 12 Sep 2020 10:08:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7FBA162DB4;\n\tSat, 12 Sep 2020 12:08:13 +0200 (CEST)", "from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0F8D162D5B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 12 Sep 2020 12:08:12 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 7D6A11BF208;\n\tSat, 12 Sep 2020 10:08:10 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 12 Sep 2020 12:11:29 +0200", "Message-Id": "<20200912101129.12625-11-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200912101129.12625-1-jacopo@jmondi.org>", "References": "<20200912101129.12625-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 10/10] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Cc": "hanlinchen@chromium.org", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 11 ++++++-----\n src/android/camera_device.h | 14 ++++++++------\n 2 files changed, 14 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4d8847e72db5..7ecb2a4d82e6 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -169,8 +169,9 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n \t}\n }\n \n-CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *e)\n-\t: format(f), size(s), index_(i), encoder_(e)\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@@ -1403,7 +1404,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@@ -1467,7 +1468,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\tCameraStream *cameraStream =\n \t\t\tstatic_cast<CameraStream *>(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();\n@@ -1502,7 +1503,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\texif.setMake(\"libcamera\");\n \t\texif.setModel(\"cameraModel\");\n \t\texif.setOrientation(orientation_);\n-\t\texif.setSize(cameraStream->size);\n+\t\texif.setSize(cameraStream->size());\n \t\t/*\n \t\t * We set the frame's EXIF timestamp as the time of encode.\n \t\t * Since the precision we need for EXIF timestamp is only one\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 49a2e7f3f8bc..1837748d2efc 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -27,18 +27,20 @@\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 *e = nullptr);\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-\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", "v4", "10/10" ] }