Patch Detail
Show a patch.
GET /api/patches/9439/?format=api
{ "id": 9439, "url": "https://patchwork.libcamera.org/api/patches/9439/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9439/", "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": "<20200902104730.43451-3-jacopo@jmondi.org>", "date": "2020-09-02T10:47:27", "name": "[libcamera-devel,2/5] android: camera_device: Generate JPEG sizes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6a676f277e560df4b90ec4d6e90fe4f7338356bd", "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/9439/mbox/", "series": [ { "id": 1255, "url": "https://patchwork.libcamera.org/api/series/1255/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1255", "date": "2020-09-02T10:47:25", "name": "android: camera_device: List JPEG/RAW correct resolutions", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1255/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9439/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9439/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 AD13EBF019\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 2 Sep 2020 10:43:58 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 892A0629B8;\n\tWed, 2 Sep 2020 12:43:58 +0200 (CEST)", "from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 193BE628EE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 2 Sep 2020 12:43:57 +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 relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 2D25C40003;\n\tWed, 2 Sep 2020 10:43:56 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 2 Sep 2020 12:47:27 +0200", "Message-Id": "<20200902104730.43451-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200902104730.43451-1-jacopo@jmondi.org>", "References": "<20200902104730.43451-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 2/5] android: camera_device: Generate JPEG\n\tsizes", "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": "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\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "When producing the list of image resolution 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\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 43 +++++++++++++++++++++++------------\n 1 file changed, 28 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex ad0d7fd15d90..8a8072123961 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -363,17 +363,27 @@ int CameraDevice::initializeStreamConfigurations()\n \t\tconst std::vector<PixelFormat> &libcameraFormats =\n \t\t\tcamera3Format.libcameraFormats;\n \n+\t\t/*\n+\t\t * Fixed format mapping for JPEG.\n+\t\t *\n+\t\t * The list of supported JPEG resolutions is generated\n+\t\t * from the list of resolutions supported by\n+\t\t * HAL_PIXEL_FORMAT_YCbCr_420_888 from which JPEG is produced.\n+\t\t *\n+\t\t * \\todo Wire the JPEG encoder interface to query the list\n+\t\t * of supported resolutions.\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 +426,22 @@ 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\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", "2/5" ] }