Patch Detail
Show a patch.
GET /api/1.1/patches/11140/?format=api
{ "id": 11140, "url": "https://patchwork.libcamera.org/api/1.1/patches/11140/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11140/", "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": "<20210204100541.657503-3-hiroh@chromium.org>", "date": "2021-02-04T10:05:37", "name": "[libcamera-devel,RFC,2/6] libcamera: ipu3: Implement tryValidate() in IPU3CameraConfiguration", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "448533edaad4a4e0b3bd07233527c235986342c7", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11140/mbox/", "series": [ { "id": 1650, "url": "https://patchwork.libcamera.org/api/1.1/series/1650/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1650", "date": "2021-02-04T10:05:35", "name": "Support stream mapping in Android HAL adaptation layer", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1650/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11140/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11140/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 A7A33BD162\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 4 Feb 2021 10:05:54 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 760AC61430;\n\tThu, 4 Feb 2021 11:05:54 +0100 (CET)", "from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com\n\t[IPv6:2607:f8b0:4864:20::42a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2560161402\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 4 Feb 2021 11:05:53 +0100 (CET)", "by mail-pf1-x42a.google.com with SMTP id w14so1822556pfi.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 04 Feb 2021 02:05:53 -0800 (PST)", "from hiroh.c.googlers.com.com\n\t(128.141.236.35.bc.googleusercontent.com. [35.236.141.128])\n\tby smtp.gmail.com with ESMTPSA id\n\tj9sm5808418pgb.47.2021.02.04.02.05.49\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 04 Feb 2021 02:05:50 -0800 (PST)" ], "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=\"l0gOpmM0\"; 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=9jWK4b9whbxiv8fx7ANqjpS0eyFsEYZHn6jOiX5aYYA=;\n\tb=l0gOpmM0PTpjmnAV2hH5RppMjhSOFh1lp/odhiGY9pewEl1BEkAhQsQPzmRNdMsIOd\n\timiEWddiB+HhrnZCd4l4aJa5GNHRSDhTJbTGB4WlaG0FPWzwcx/iZL6cMxNYhIQlRNbx\n\tZHkAQM4rsHV5/pwg0n4axKfthHASNU0hv442U=", "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=9jWK4b9whbxiv8fx7ANqjpS0eyFsEYZHn6jOiX5aYYA=;\n\tb=icT2QQIHRUyw8tvZnTG8xMEloPCi7KlkVibpN8Uw6pt9k36qLkiVPz70jSeu9YTi+S\n\te8MAvDl+e4cq6CXKPuGm9aWtKZ6tktKbgvTDwdOw29SgyX+ica/7pYxpauHIviRE0NGX\n\tgcW3Gtpt93Qka783B9rWjbpfPLOsjJGlN9tZWIfErhekCuqV1Ga9U4HmX1oOKNR/YzFm\n\tnrZa/PFFm9RAhqEjcgZqEcJJ1unDxulyEyD8xaIN4D3x+7AY9TIny2K7PdJK1xUh6KHp\n\t1ocZlXVBMsnHFpG6qjTMhQmIEVnmIKi1xcb8XlLcA6Vqf3HpEryI3dghvE+2ZneXulLi\n\tGPvw==", "X-Gm-Message-State": "AOAM530IAaCHu6v5gq4UAb7r4isjLNvQLHk0KJDDpW1vhT3wiYcjatQ1\n\tSMYL2K62WJD9xKkbouMfKQg+LZ4Z7rduoFlf", "X-Google-Smtp-Source": "ABdhPJwu/DDS6qdbLn2wChigESHdwK95GkPJPUtryMsUu5/spgRkdFOcUTOeQUvnmYPKarPdqpsrNg==", "X-Received": "by 2002:a63:3e0c:: with SMTP id\n\tl12mr8146527pga.165.1612433151477; \n\tThu, 04 Feb 2021 02:05:51 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 4 Feb 2021 10:05:37 +0000", "Message-Id": "<20210204100541.657503-3-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.30.0.365.g02bc693789-goog", "In-Reply-To": "<20210204100541.657503-1-hiroh@chromium.org>", "References": "<20210204100541.657503-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [RFC PATCH 2/6] libcamera: ipu3: Implement\n\ttryValidate() in IPU3CameraConfiguration", "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": "IPU3CameraConfiguration::tryValidate() is implemented. It is\nmostly the same as the validate() implementation.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 2 +-\n src/libcamera/pipeline/ipu3/imgu.h | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 160 +++++++++++++++++++++++++++\n 3 files changed, 162 insertions(+), 2 deletions(-)\n\n--\n2.30.0.365.g02bc693789-goog", "diff": "diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 5b1c0318..36c5c03c 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -377,7 +377,7 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n * \\return An ImgUDevice::PipeConfig instance on success, an empty configuration\n * otherwise\n */\n-ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)\n+ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe) const\n {\n \tpipeConfigs.clear();\n\ndiff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\nindex c73ac5a5..4204f50d 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.h\n+++ b/src/libcamera/pipeline/ipu3/imgu.h\n@@ -43,7 +43,7 @@ public:\n\n \tint init(MediaDevice *media, unsigned int index);\n\n-\tPipeConfig calculatePipeConfig(Pipe *pipe);\n+\tPipeConfig calculatePipeConfig(Pipe *pipe) const;\n\n \tint configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);\n\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex db0d6b91..89f1983a 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -73,11 +73,15 @@ public:\n \tIPU3CameraConfiguration(IPU3CameraData *data);\n\n \tStatus validate() override;\n+\tbool tryValidate(std::vector<std::pair<StreamConfiguration, Status>> &config) const override;\n\n \tconst StreamConfiguration &cio2Format() const { return cio2Configuration_; }\n \tconst ImgUDevice::PipeConfig imguConfig() const { return pipeConfig_; }\n\n private:\n+\tbool tryValidateInternal(\n+\t\tstd::vector<std::pair<StreamConfiguration, Status>> &configs,\n+\t\tImgUDevice::PipeConfig &pipeConfig) const;\n \t/*\n \t * The IPU3CameraData instance is guaranteed to be valid as long as the\n \t * corresponding Camera instance is valid. In order to borrow a\n@@ -140,6 +144,162 @@ IPU3CameraConfiguration::IPU3CameraConfiguration(IPU3CameraData *data)\n \tdata_ = data;\n }\n\n+\n+bool IPU3CameraConfiguration::tryValidateInternal(\n+\tstd::vector<std::pair<StreamConfiguration, Status>> &configs,\n+\tImgUDevice::PipeConfig &pipeConfig) const\n+{\n+\tif (configs.empty() || configs.size() > IPU3_MAX_STREAMS)\n+\t\treturn false;\n+\n+\tunsigned int rawCount = 0;\n+\tunsigned int yuvCount = 0;\n+\tSize maxYuvSize;\n+\tfor (size_t i = 0; i < configs.size(); ++i) {\n+\t\tconst auto &cfg = configs[i].first;\n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\t\trawCount++;\n+\t\t} else {\n+\t\t\tyuvCount++;\n+\t\t\tmaxYuvSize.expandTo(cfg.size);\n+\t\t}\n+\t}\n+\tLOG(IPU3, Debug) << rawCount << \", \" << yuvCount;\n+\tif (rawCount > 1 || yuvCount > 2)\n+\t\treturn false;\n+\n+\tStreamConfiguration cio2Configuration =\n+\t\tdata_->cio2_.generateConfiguration({});\n+\tif (!cio2Configuration.pixelFormat.isValid())\n+\t\treturn false;\n+\tLOG(IPU3, Debug) << \"CIO2 configuration: \" << cio2Configuration.toString();\n+\n+\tImgUDevice::Pipe pipe{};\n+\tpipe.input = cio2Configuration.size;\n+\n+\tbool mainOutputAvailable = true;\n+\tfor (auto &[cfg, status] : configs) {\n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n+\t\tconst StreamConfiguration originalCfg = cfg;\n+\n+\t\tLOG(IPU3, Debug) << \"Validating \" << cfg.toString()\n+\t\t\t\t << \" to the raw stream\";\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) {\n+\t\t\tcfg.size = cio2Configuration.size;\n+\t\t\tcfg.pixelFormat = cio2Configuration.pixelFormat;\n+\t\t\tcfg.bufferCount = cio2Configuration.bufferCount;\n+\t\t\tcfg.stride = info.stride(cfg.size.width, 0, 64);\n+\t\t\tcfg.frameSize = info.frameSize(cfg.size, 64);\n+\t\t\tcfg.setStream(const_cast<Stream *>(&data_->rawStream_));\n+\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n+\t\t\t\t\t << \" to the raw stream\";\n+\t\t} else {\n+\t\t\tunsigned int limit;\n+\t\t\tlimit = utils::alignDown(cio2Configuration.size.width - 1,\n+\t\t\t\t\t\t IMGU_OUTPUT_WIDTH_MARGIN);\n+\t\t\tcfg.size.width = std::clamp(cfg.size.width,\n+\t\t\t\t\t\t IMGU_OUTPUT_MIN_SIZE.width,\n+\t\t\t\t\t\t limit);\n+\n+\t\t\tlimit = utils::alignDown(cio2Configuration.size.height - 1,\n+\t\t\t\t\t\t IMGU_OUTPUT_HEIGHT_MARGIN);\n+\t\t\tcfg.size.height = std::clamp(cfg.size.height,\n+\t\t\t\t\t\t IMGU_OUTPUT_MIN_SIZE.height,\n+\t\t\t\t\t\t limit);\n+\n+\t\t\tcfg.size.alignDownTo(IMGU_OUTPUT_WIDTH_ALIGN,\n+\t\t\t\t\t IMGU_OUTPUT_HEIGHT_ALIGN);\n+\n+\t\t\tcfg.pixelFormat = formats::NV12;\n+\t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n+\t\t\tcfg.stride = info.stride(cfg.size.width, 0, 1);\n+\t\t\tcfg.frameSize = info.frameSize(cfg.size, 1);\n+\n+\t\t\tif (mainOutputAvailable &&\n+\t\t\t (originalCfg.size == maxYuvSize || yuvCount == 1)) {\n+\t\t\t\tcfg.setStream(const_cast<Stream *>(&data_->outStream_));\n+\t\t\t\tmainOutputAvailable = false;\n+\n+\t\t\t\tpipe.main = cfg.size;\n+\t\t\t\tif (yuvCount == 1)\n+\t\t\t\t\tpipe.viewfinder = pipe.main;\n+\n+\t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n+\t\t\t\t\t\t << \" to the main output\";\n+\t\t\t} else {\n+\t\t\t\tcfg.setStream(const_cast<Stream *>(&data_->vfStream_));\n+\t\t\t\tpipe.viewfinder = cfg.size;\n+\n+\t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg.toString()\n+\t\t\t\t\t\t << \" to the viewfinder output\";\n+\t\t\t}\n+\t\t}\n+\t\tif (cfg.pixelFormat != originalCfg.pixelFormat ||\n+\t\t cfg.size != originalCfg.size) {\n+\t\t\tLOG(IPU3, Debug)\n+\t\t\t\t<< \"Stream configuration adjusted to \"\n+\t\t\t\t<< cfg.toString();\n+\n+\t\t\tstatus = Adjusted;\n+\t\t}\n+\t}\n+\n+\tif (yuvCount) {\n+\t\tpipeConfig = data_->imgu_->calculatePipeConfig(&pipe);\n+\t\tif (pipeConfig.isNull())\n+\t\t\treturn false;\n+\t}\n+\treturn true;\n+}\n+\n+bool IPU3CameraConfiguration::tryValidate(\n+\tstd::vector<std::pair<StreamConfiguration, Status>> &configs) const\n+{\n+\tif (configs.empty())\n+\t\treturn Invalid;\n+\n+\tstruct AcceptedConfig {\n+\t\tStreamConfiguration config;\n+\t\tStatus status;\n+\t\tunsigned int index;\n+\t};\n+\tstd::vector<AcceptedConfig> acceptedConfigs;\n+\tfor (unsigned int i = 0; i < configs.size(); ++i) {\n+\t\tLOG(IPU3, Debug) << \"Trying config #\" << i\n+\t\t\t\t << \": \" << configs[i].first.toString();\n+\t\tstd::vector<std::pair<StreamConfiguration, Status>>\n+\t\t\ttryConfigs(acceptedConfigs.size() + 1);\n+\t\tfor (unsigned int j = 0; j < acceptedConfigs.size(); ++j) {\n+\t\t\ttryConfigs[j].first = acceptedConfigs[j].config;\n+\t\t\ttryConfigs[j].second = Valid;\n+\t\t}\n+\t\ttryConfigs.back().first = configs[i].first;\n+\t\ttryConfigs.back().second = Valid;\n+\t\tImgUDevice::PipeConfig tryPipeConfig;\n+\t\tif (!tryValidateInternal(tryConfigs, tryPipeConfig))\n+\t\t\tcontinue;\n+\n+\t\tfor (unsigned int j = 0; j < acceptedConfigs.size(); ++j) {\n+\t\t\tacceptedConfigs[j].config = tryConfigs[j].first;\n+\t\t\tacceptedConfigs[j].status = tryConfigs[j].second;\n+\t\t}\n+\t\tacceptedConfigs.push_back(\n+\t\t\t{ tryConfigs[i].first, tryConfigs[i].second, i });\n+\t}\n+\n+\tfor (unsigned int i = 0; i < configs.size(); ++i)\n+\t\tconfigs[i].second = Invalid;\n+\n+\tfor (auto &&ac : acceptedConfigs) {\n+\t\tunsigned int i = ac.index;\n+\t\tconfigs[i].first = std::move(ac.config);\n+\t\tconfigs[i].second = ac.status;\n+\t}\n+\n+\treturn !acceptedConfigs.empty();\n+}\n+\n CameraConfiguration::Status IPU3CameraConfiguration::validate()\n {\n \tStatus status = Valid;\n", "prefixes": [ "libcamera-devel", "RFC", "2/6" ] }