Patch Detail
Show a patch.
GET /api/patches/9533/?format=api
{ "id": 9533, "url": "https://patchwork.libcamera.org/api/patches/9533/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9533/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20200908134142.27470-3-jacopo@jmondi.org>", "date": "2020-09-08T13:41:33", "name": "[libcamera-devel,v3,02/11] android: camera_device: Generate JPEG sizes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4179a00d75a02498d58d2ca3500585801056a05b", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9533/mbox/", "series": [ { "id": 1274, "url": "https://patchwork.libcamera.org/api/series/1274/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1274", "date": "2020-09-08T13:41:31", "name": "android: camera_device: Fix JPEG/RAW sizes", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1274/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9533/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9533/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 E657CBDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 8 Sep 2020 13:38:08 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BEABD62C4B;\n\tTue, 8 Sep 2020 15:38:08 +0200 (CEST)", "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EFED462C30\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 8 Sep 2020 15:38:06 +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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 938D71C000A;\n\tTue, 8 Sep 2020 13:38:05 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 8 Sep 2020 15:41:33 +0200", "Message-Id": "<20200908134142.27470-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200908134142.27470-1-jacopo@jmondi.org>", "References": "<20200908134142.27470-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 02/11] android: camera_device: Generate\n\tJPEG sizes", "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=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "When producing the list of image resolutions to claim as supported by the\ncamera HAL, the JPEG stream was assumed to be 'always valid' as, at the\ntime, there was no JPEG support in place at all.\n\nWith the introduction of support for JPEG compression, reporting\nnon-valid sizes as supported obviously causes troubles.\n\nIn order to avoid reporting non-supported resolutions as supported,\nproduce the list of available JPEG sizes by using the ones supported\nby the YCbCr_420_888 format, from which the JPEG stream is encoded.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 40 ++++++++++++++++++++++-------------\n 1 file changed, 25 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 28fb3868c082..1b2e12d6d33c 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -363,17 +363,21 @@ int CameraDevice::initializeStreamConfigurations()\n \t\tconst std::vector<PixelFormat> &libcameraFormats =\n \t\t\tcamera3Format.libcameraFormats;\n \n+\t\t/*\n+\t\t * JPEG is always supported, either produced directly by the\n+\t\t * camera, or encoded in the HAL.\n+\t\t */\n+\t\tif (androidFormat == HAL_PIXEL_FORMAT_BLOB) {\n+\t\t\tformatsMap_[androidFormat] = formats::MJPEG;\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\t/*\n \t\t * Test the libcamera formats that can produce images\n \t\t * compatible with the format defined by Android.\n \t\t */\n \t\tPixelFormat mappedFormat;\n \t\tfor (const PixelFormat &pixelFormat : libcameraFormats) {\n-\t\t\t/* \\todo Fixed mapping for JPEG. */\n-\t\t\tif (androidFormat == HAL_PIXEL_FORMAT_BLOB) {\n-\t\t\t\tmappedFormat = formats::MJPEG;\n-\t\t\t\tbreak;\n-\t\t\t}\n \n \t\t\t/*\n \t\t\t * The stream configuration size can be adjusted,\n@@ -416,19 +420,25 @@ int CameraDevice::initializeStreamConfigurations()\n \t\t\tcfg.size = res;\n \n \t\t\tCameraConfiguration::Status status = cameraConfig->validate();\n-\t\t\t/*\n-\t\t\t * Unconditionally report we can produce JPEG.\n-\t\t\t *\n-\t\t\t * \\todo The JPEG stream will be implemented as an\n-\t\t\t * HAL-only stream, but some cameras can produce it\n-\t\t\t * directly. As of now, claim support for JPEG without\n-\t\t\t * inspecting where the JPEG stream is produced.\n-\t\t\t */\n-\t\t\tif (androidFormat != HAL_PIXEL_FORMAT_BLOB &&\n-\t\t\t status != CameraConfiguration::Valid)\n+\t\t\tif (status != CameraConfiguration::Valid)\n \t\t\t\tcontinue;\n \n \t\t\tstreamConfigurations_.push_back({ res, androidFormat });\n+\n+\t\t\t/*\n+\t\t\t * If the format is HAL_PIXEL_FORMAT_YCbCr_420_888\n+\t\t\t * from which JPEG is produced, add an entry for\n+\t\t\t * the JPEG stream.\n+\t\t\t *\n+\t\t\t * \\todo Wire the JPEG encoder to query the supported\n+\t\t\t * sizes provided a list of formats it can encode.\n+\t\t\t *\n+\t\t\t * \\todo Support JPEG streams produced by the Camera\n+\t\t\t * natively.\n+\t\t\t */\n+\t\t\tif (androidFormat == HAL_PIXEL_FORMAT_YCbCr_420_888)\n+\t\t\t\tstreamConfigurations_.push_back(\n+\t\t\t\t\t{ res, HAL_PIXEL_FORMAT_BLOB });\n \t\t}\n \t}\n \n", "prefixes": [ "libcamera-devel", "v3", "02/11" ] }