{"id":3293,"url":"https://patchwork.libcamera.org/api/patches/3293/?format=json","web_url":"https://patchwork.libcamera.org/patch/3293/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200323232901.29169-3-kgupta@es.iitr.ac.in>","date":"2020-03-23T23:29:00","name":"[libcamera-devel,2/3] libcamera: pipeline: rkisp1: Use parameterized StreamConfiguration","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"04ad178911cde89668db1f74c14adb9303ed0c4b","submitter":{"id":39,"url":"https://patchwork.libcamera.org/api/people/39/?format=json","name":"Kaaira Gupta","email":"kgupta@es.iitr.ac.in"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3293/mbox/","series":[{"id":766,"url":"https://patchwork.libcamera.org/api/series/766/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=766","date":"2020-03-23T23:28:58","name":"Use StreamFormats in pipelines","version":1,"mbox":"https://patchwork.libcamera.org/series/766/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3293/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3293/checks/","tags":{},"headers":{"Return-Path":"","Received":["from mail-pf1-x431.google.com (mail-pf1-x431.google.com\n\t[IPv6:2607:f8b0:4864:20::431])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0041560417\n\tfor ;\n\tTue, 24 Mar 2020 00:30:31 +0100 (CET)","by mail-pf1-x431.google.com with SMTP id j1so5619006pfe.0\n\tfor ;\n\tMon, 23 Mar 2020 16:30:31 -0700 (PDT)","from kaaira-HP-Pavilion-Notebook ([103.113.213.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tj14sm2244008pgk.74.2020.03.23.16.30.29\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Mar 2020 16:30:29 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=7aT/VOTF4OI5tBdLEsW/gGD8NC+znxJEhpvIOMeYaAk=;\n\tb=wiT/Z4lsRkmmb6XhB4yvtmZmfZRvCrjhJh6utFFzCd6inimZBXiJkUnGLbaPuoibDc\n\tW5J2mpWQ3KTCei2DvWqa5NviluymJQq0Vln64qCQbADpPpaK5IhToGHZVniB/im+T40J\n\tpxZyB5H4YIWS/sbCuCQtGprDYTdSyQl01yNx/LkVvlDcgm3ODpgBQ8SWb0TKn3TFYva1\n\t5lIbOTMcgeuaWuc4gjpecWiHBzfaxDHtJ4BfFhVY/5Veaz8mF9q39lVivqtO5Xa72aKy\n\tWNgFskkAuZ5so4OGz/Gz6+0bm6Q1huLkpLQQgLd+fn+138U1rjnFGMzl66uLHuMpGi2p\n\tQ8WQ==","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;\n\tbh=7aT/VOTF4OI5tBdLEsW/gGD8NC+znxJEhpvIOMeYaAk=;\n\tb=j483C4WNviHFyYKy3hXqE1tA/8KtccdQ8LGCHn2hlNlJVD0m0J78/XOvUZ1lKQRizB\n\trBYWcd8jDuFQD16taTbyvILXsUXBOXjyRj2wCYMnfpKJmE+cpiH8zbOYgzWKNHdyFiFV\n\tV5N8g3BTCmvYs42ICE0y+cM1NkbamECHYRgxuUxy9L09v5OhNLL5VK43hZo6C8EvH0UC\n\td/s+9ryLeQXP2hZWlPTwYT0jpJHQ4WL636xohMVG7vpVka5hMA+0XRfrv/08l67Nl27o\n\t21XoLh95dIraebycyKAwYHR01eprygY/uzVX44idRKPAg4mE66iJtz7YX/UNT+wg0uSM\n\tZsMA==","X-Gm-Message-State":"ANhLgQ19AeKIFKM05zFTm1Mk1KqNZ0cfWpejTzc/NvrnxBogILMlgUs8\n\tzuUpysos43FElmJc0J3sgkuHTg==","X-Google-Smtp-Source":"ADFU+vseyh17VfXtm5s8XV/149Ru55z0rlS2r6IKi9BXQPkbI7ngs8djZnIRVHc523Yyva6Lu3JQMQ==","X-Received":"by 2002:aa7:828e:: with SMTP id\n\ts14mr25576663pfm.15.1585006230564; \n\tMon, 23 Mar 2020 16:30:30 -0700 (PDT)","From":"Kaaira Gupta ","To":"libcamera-devel@lists.libcamera.org,\n\tKieran Bingham ,\n\tHelen Koike ,\n\tVaishali Thakkar ","Cc":"Kaaira Gupta ","Date":"Tue, 24 Mar 2020 04:59:00 +0530","Message-Id":"<20200323232901.29169-3-kgupta@es.iitr.ac.in>","X-Mailer":"git-send-email 2.17.1","In-Reply-To":"<20200323232901.29169-1-kgupta@es.iitr.ac.in>","References":"<20200323232901.29169-1-kgupta@es.iitr.ac.in>","Subject":"[libcamera-devel] [PATCH 2/3] libcamera: pipeline: rkisp1: Use\n\tparameterized StreamConfiguration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 23 Mar 2020 23:30:32 -0000"},"content":"Replace default constructor StreamConfiguration() by it's parameterized\ncounterpart by using StreamFormats in generateConfiguration() in\nrkisp1.\n\nSigned-off-by: Kaaira Gupta \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 39 ++++++++++++++++--------\n 1 file changed, 27 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 04b0ed3..cfbfc9e 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -218,6 +218,21 @@ private:\n \tCamera *activeCamera_;\n };\n \n+namespace {\n+\n+static const std::array formats{\n+\tPixelFormat(DRM_FORMAT_YUYV),\n+\tPixelFormat(DRM_FORMAT_YVYU),\n+\tPixelFormat(DRM_FORMAT_VYUY),\n+\tPixelFormat(DRM_FORMAT_NV16),\n+\tPixelFormat(DRM_FORMAT_NV61),\n+\tPixelFormat(DRM_FORMAT_NV21),\n+\tPixelFormat(DRM_FORMAT_NV12),\n+\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n+};\n+\n+} /* namespace */\n+\n RkISP1Frames::RkISP1Frames(PipelineHandler *pipe)\n \t: pipe_(dynamic_cast(pipe))\n {\n@@ -430,17 +445,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array formats{\n-\t\tPixelFormat(DRM_FORMAT_YUYV),\n-\t\tPixelFormat(DRM_FORMAT_YVYU),\n-\t\tPixelFormat(DRM_FORMAT_VYUY),\n-\t\tPixelFormat(DRM_FORMAT_NV16),\n-\t\tPixelFormat(DRM_FORMAT_NV61),\n-\t\tPixelFormat(DRM_FORMAT_NV21),\n-\t\tPixelFormat(DRM_FORMAT_NV12),\n-\t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n-\t};\n-\n \tconst CameraSensor *sensor = data_->sensor_;\n \tStatus status = Valid;\n \n@@ -541,7 +545,18 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \tif (roles.empty())\n \t\treturn config;\n \n-\tStreamConfiguration cfg{};\n+\tstd::map> pixelformats;\n+\tfor (PixelFormat pixelformat : formats) {\n+\t\tstd::vector sizes{\n+\t\t\t/* Minimum and maximum capabilities of ISP output */\n+\t\t\tSizeRange{ { 32, 16 }, { 4416, 3312 } }\n+\t\t};\n+\t\tpixelformats[pixelformat] = sizes;\n+\t}\n+\n+\tStreamFormats format(pixelformats);\n+\tStreamConfiguration cfg(format);\n+\n \tcfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12);\n \tcfg.size = data->sensor_->resolution();\n \n","prefixes":["libcamera-devel","2/3"]}