Patch Detail
Show a patch.
GET /api/patches/9245/?format=api
{ "id": 9245, "url": "https://patchwork.libcamera.org/api/patches/9245/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9245/", "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": "<20200806061706.1025788-2-hiroh@chromium.org>", "date": "2020-08-06T06:17:06", "name": "[libcamera-devel,1/1] android: [WIP] Map between camera configuration and requested configuration", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f79486be4ef0c66d6a5635ae8a741fdff4b01dc5", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9245/mbox/", "series": [ { "id": 1202, "url": "https://patchwork.libcamera.org/api/series/1202/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1202", "date": "2020-08-06T06:17:05", "name": "Proposal of mapping between camera configurations and requested configurations", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1202/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9245/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9245/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 58F0ABD86F\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 6 Aug 2020 06:17:19 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2413860740;\n\tThu, 6 Aug 2020 08:17:19 +0200 (CEST)", "from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com\n\t[IPv6:2607:f8b0:4864:20::1034])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 281446038D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Aug 2020 08:17:18 +0200 (CEST)", "by mail-pj1-x1034.google.com with SMTP id c6so6113895pje.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 05 Aug 2020 23:17:18 -0700 (PDT)", "from hiroh.tok.corp.google.com\n\t([2401:fa00:8f:2:de4a:3eff:fe7d:f78f])\n\tby smtp.gmail.com with ESMTPSA id\n\t21sm6388267pfa.4.2020.08.05.23.17.14\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 05 Aug 2020 23:17:15 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"YtXY/oDU\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=PNsObdRFmanHdtmQQrGXJSwOWh+FdhVCiYIUAYe5rRs=;\n\tb=YtXY/oDUReNqZ6CSaiT8NX3UBG4pqE27+Gkpyd0TivXC/iJ8QZMuXjVDJLyawT+44A\n\t9fFBl3YI2Nj41jbUl1N0Qh1PH0UneuLWTB3R/Vvg1KfroDarb5RV2yxy1n1JVMQ30LvN\n\tEgs8SX2jN+2x1wYo8i+F0DW1qDrkK5y5wMCeE=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=PNsObdRFmanHdtmQQrGXJSwOWh+FdhVCiYIUAYe5rRs=;\n\tb=kfMbxN2E5StxG/hixbacqaeUt/nxrigAPEGoL5l5inj+nNwItqHG4otgXenJ0HLP32\n\t/cIZ295eYQnMnivut00tWv2NOGhk2sIvN17FP47m12VQl+HPgLsJhRzDxswosdEznhrc\n\td8gJMj/jcoQ+Uw2FQI3s0BYWq6w+gIJpuoZajSyLSgYvSzjtmcMhPWxknTPh40gLZhMw\n\tyR/m9/JC238ljfwAxdVTI43cHktp7EmvDQehiZgPVpkXIQEkBSo3av5sx+9U20XTeOmO\n\tXZDABv/13fnZLMKFrIkTygea6SxJeruQCETY0iHdivUM+qKwhGq1SenbY5mnA6icMw+i\n\tZQ7g==", "X-Gm-Message-State": "AOAM532PY55rdM+zPa/vjhK/Ed6UZJroHU5+atFYryg4zOg/mRpyDKnv\n\ttfmnWmrG0GQZtUJF7CJVfe/Ic+YLt2A=", "X-Google-Smtp-Source": "ABdhPJyYzQnWvY4gyXcSpsBBfKfKQ6AppiuGyMeAcJOqBxhO7s+5Z6pVzejRFyowRXvP52AXkU7ZcA==", "X-Received": "by 2002:a17:902:ee82:: with SMTP id\n\ta2mr6206943pld.204.1596694636040; \n\tWed, 05 Aug 2020 23:17:16 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 6 Aug 2020 15:17:06 +0900", "Message-Id": "<20200806061706.1025788-2-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.28.0.236.gb10cc79966-goog", "In-Reply-To": "<20200806061706.1025788-1-hiroh@chromium.org>", "References": "<20200806061706.1025788-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 1/1] android: [WIP] Map between camera\n\tconfiguration and requested configuration", "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": "Signed-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/android/camera_device.cpp | 136 ++++++++++++++++++++++++++++++----\n src/android/camera_device.h | 12 ++-\n 2 files changed, 133 insertions(+), 15 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex b49d668..0f0a540 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -913,7 +913,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \treturn requestTemplate->get();\n }\n \n-PixelFormat CameraDevice::toPixelFormat(int format)\n+PixelFormat CameraDevice::toPixelFormat(int format) const\n {\n \t/* Translate Android format code to libcamera pixel format. */\n \tauto it = formatsMap_.find(format);\n@@ -985,26 +985,18 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \n \tswitch (config_->validate()) {\n \tcase CameraConfiguration::Valid:\n-\t\tbreak;\n \tcase CameraConfiguration::Adjusted:\n-\t\tLOG(HAL, Info) << \"Camera configuration adjusted\";\n-\t\tconfig_.reset();\n-\t\treturn -EINVAL;\n+\t\tbreak;\n \tcase CameraConfiguration::Invalid:\n \t\tLOG(HAL, Info) << \"Camera configuration invalid\";\n \t\tconfig_.reset();\n \t\treturn -EINVAL;\n \t}\n \n-\tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n-\t\tcamera3_stream_t *stream = stream_list->streams[i];\n-\t\tCameraStream *cameraStream = &streams_[i];\n-\t\tStreamConfiguration &cfg = config_->at(cameraStream->index);\n-\n-\t\t/* Use the bufferCount confirmed by the validation process. */\n-\t\tstream->max_buffers = cfg.bufferCount;\n+\tif (!mapStreams(stream_list, *config_)) {\n+\t LOG(HAL, Info) << \"Unsupported configurations\";\n+\t return -EINVAL;\n \t}\n-\n \t/*\n \t * Once the CameraConfiguration has been adjusted/validated\n \t * it can be applied to the camera.\n@@ -1277,3 +1269,121 @@ std::unique_ptr<CameraMetadata> CameraDevice::getResultMetadata(int frame_number\n \n \treturn resultMetadata;\n }\n+\n+bool CameraDevice::convertible(const Size& srcSize, const PixelFormat& srcFormat,\n+\t\t\t const Size& dstSize, const PixelFormat& dstFormat) const\n+{\n+ // TODO: Implement this.\n+ return true;\n+}\n+\n+bool CameraDevice::getBestCameraStream(\n+ const std::vector<libcamera::CameraConfiguration::const_iterator>& sameRatios,\n+ const std::vector<libcamera::CameraConfiguration::const_iterator>& sameFormats,\n+ const Size& requestedSize,\n+ const PixelFormat& requestedFormat,\n+ libcamera::CameraConfiguration::const_iterator* bestCameraStream) const\n+{\n+ // 3. Find the stream whose ratio and format are same as requested ones.\n+ for (const auto& it : sameRatios) {\n+\tif (std::find(sameFormats.begin(), sameFormats.end(), it) != sameFormats.end() &&\n+\t convertible(requestedSize, requestedFormat, it->size, it->pixelFormat)) {\n+\t // SameRatio and sameFormat.\n+\t // Scale-only. (or no-op if the resolution is the same as the requested one.\n+\t *bestCameraStream = it;\n+\t return true;\n+\t}\n+ }\n+\n+ // 4. Find the smallest resolution stream among ones whose ratios are the same as requested one.\n+ for (const auto& it : sameRatios) {\n+\tif (convertible(requestedSize, requestedFormat, it->size, it->pixelFormat)) {\n+\t // Scale & Pixel format conversion.\n+\t *bestCameraStream = it;\n+\t return true;\n+\t}\n+ }\n+\n+ // 5. Find the smallest resolution stream among ones whose formats are the same as requested one.\n+ for (const auto& it : sameFormats) {\n+\tif (convertible(requestedSize, requestedFormat, it->size, it->pixelFormat)) {\n+\t // Scale & Crop.\n+\t *bestCameraStream = it;\n+\t return true;\n+\t}\n+ }\n+ return false;\n+}\n+\n+/*\n+ * Finds best matching between requested configurations and configurations adjusted by CameraConfiguration class.\n+ * Returns false if no convertible camera configuration is found for a requested configuration.\n+ */\n+bool CameraDevice::mapStreams(camera3_stream_configuration_t* requestedStreams,\n+\t\t\t const libcamera::CameraConfiguration& config) const {\n+ std::vector<libcamera::CameraConfiguration::const_iterator> candidates;\n+ for (auto it = config.begin(); it != config.end(); ++it) {\n+\tcandidates.push_back(it);\n+ }\n+\n+ for (size_t i = 0; i < requestedStreams->num_streams; ++i) {\n+\tconst camera3_stream_t& requestedStream = *requestedStreams->streams[i];\n+\tconst Size requestedSize(requestedStream.width, requestedStream.height);\n+\tdecltype(candidates) currentCandidates;\n+\t// 1. Filters out smaller resolution's streams than requestedSize.\n+\tstd::copy_if(candidates.begin(), candidates.end(),\n+\t\t std::back_inserter(currentCandidates),\n+\t\t [requestedSize](const auto& it) {\n+\t\t\t const StreamConfiguration& cfg = *it;\n+\t\t\t return requestedSize.width <= cfg.size.width &&\n+\t\t\t requestedSize.height <= cfg.size.height;\n+\t\t });\n+\t// 2. Prioritizes smaller resolutions.\n+\tstd::sort(currentCandidates.begin(), currentCandidates.end(),\n+\t\t [](const auto& itA, const auto& itB) {\n+\t\t return itA->size < itB->size;\n+\t\t });\n+\n+\tauto getRatio = [](const Size& size) {\n+\t\t\t int d = std::__gcd(size.width, size.height);\n+\t\t\t return Size(size.width / d, size.height / d);\n+\t\t\t};\n+\tdecltype(candidates) sameRatios; // = list of ones whose ratios are as requested one.\n+\tstd::copy_if(currentCandidates.begin(), currentCandidates.end(),\n+\t\t std::back_inserter(sameRatios),\n+\t\t [&getRatio, requestedRatio=getRatio(requestedSize)](const auto& it) {\n+\t\t\t return requestedRatio == getRatio(it->size);\n+\t\t });\n+\tdecltype(candidates) sameFormats; // = list of ones whose formats are as requested one.\n+\tconst PixelFormat requestedFormat = toPixelFormat(requestedStream.format);\n+\tif (requestedFormat.isValid()) {\n+\t std::copy_if(currentCandidates.begin(), currentCandidates.end(),\n+\t\t\t std::back_inserter(sameFormats),\n+\t\t\t [requestedFormat](const auto& it) {\n+\t\t\t return requestedFormat == it->pixelFormat;\n+\t\t\t });\n+\t}\n+\n+\tauto bestCameraStream = config.end();\n+\tif (!getBestCameraStream(sameRatios, sameFormats, requestedSize, requestedFormat, &bestCameraStream)) {\n+\t // 6. Find one whose resolution is the smallest among convertible ones.\n+\t auto convertibleConfig =\n+\t\tstd::find_if(currentCandidates.begin(), currentCandidates.end(),\n+\t\t\t [requestedSize, requestedFormat,this](const auto& it) {\n+\t\t\t\t return convertible(requestedSize, requestedFormat, it->size, it->pixelFormat);\n+\t\t\t });\n+\t if (convertibleConfig != currentCandidates.end()) {\n+\t\t// No map is available.\n+\t\tLOG(HAL, Info) << \"No convertible configuration, i=\" << i;\n+\t\treturn false;\n+\t }\n+\t bestCameraStream = *convertibleConfig;\n+\t}\n+\tassert(bestCameraStream != config.end());\n+\n+\tCameraStream* cameraStream = reinterpret_cast<CameraStream*>(requestedStreams->streams[i]->priv);\n+\tcameraStream->index = (unsigned int) (bestCameraStream - config.begin());\n+ }\n+\n+ return true;\n+}\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 00472c2..fdbc9f3 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -83,10 +83,18 @@ private:\n \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n-\tlibcamera::PixelFormat toPixelFormat(int format);\n+\tlibcamera::PixelFormat toPixelFormat(int format) const;\n \tstd::unique_ptr<CameraMetadata> getResultMetadata(int frame_number,\n \t\t\t\t\t\t\t int64_t timestamp);\n-\n+\tbool convertible(const libcamera::Size& srcSize, const libcamera::PixelFormat& srcFormat,\n+\t\t\tconst libcamera::Size& dstSize, const libcamera::PixelFormat& dstFormat) const;\n+\tbool getBestCameraStream(const std::vector<libcamera::CameraConfiguration::const_iterator>& sameRatios,\n+\t\t\t\tconst std::vector<libcamera::CameraConfiguration::const_iterator>& sameFormats,\n+\t\t\t\tconst libcamera::Size& requestedSize,\n+\t\t\t\tconst libcamera::PixelFormat& requestedFormat,\n+\t\t\t\tlibcamera::CameraConfiguration::const_iterator* bestCameraStream) const;\n+\tbool mapStreams(camera3_stream_configuration_t* requestedStreams,\n+\t\t\tconst libcamera::CameraConfiguration& config) const;\n \tunsigned int id_;\n \tcamera3_device_t camera3Device_;\n \n", "prefixes": [ "libcamera-devel", "1/1" ] }