From patchwork Mon Mar 23 23:29:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 3293 Return-Path: Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0041560417 for ; Tue, 24 Mar 2020 00:30:31 +0100 (CET) Received: by mail-pf1-x431.google.com with SMTP id j1so5619006pfe.0 for ; Mon, 23 Mar 2020 16:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7aT/VOTF4OI5tBdLEsW/gGD8NC+znxJEhpvIOMeYaAk=; b=wiT/Z4lsRkmmb6XhB4yvtmZmfZRvCrjhJh6utFFzCd6inimZBXiJkUnGLbaPuoibDc W5J2mpWQ3KTCei2DvWqa5NviluymJQq0Vln64qCQbADpPpaK5IhToGHZVniB/im+T40J pxZyB5H4YIWS/sbCuCQtGprDYTdSyQl01yNx/LkVvlDcgm3ODpgBQ8SWb0TKn3TFYva1 5lIbOTMcgeuaWuc4gjpecWiHBzfaxDHtJ4BfFhVY/5Veaz8mF9q39lVivqtO5Xa72aKy WNgFskkAuZ5so4OGz/Gz6+0bm6Q1huLkpLQQgLd+fn+138U1rjnFGMzl66uLHuMpGi2p Q8WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7aT/VOTF4OI5tBdLEsW/gGD8NC+znxJEhpvIOMeYaAk=; b=j483C4WNviHFyYKy3hXqE1tA/8KtccdQ8LGCHn2hlNlJVD0m0J78/XOvUZ1lKQRizB rBYWcd8jDuFQD16taTbyvILXsUXBOXjyRj2wCYMnfpKJmE+cpiH8zbOYgzWKNHdyFiFV V5N8g3BTCmvYs42ICE0y+cM1NkbamECHYRgxuUxy9L09v5OhNLL5VK43hZo6C8EvH0UC d/s+9ryLeQXP2hZWlPTwYT0jpJHQ4WL636xohMVG7vpVka5hMA+0XRfrv/08l67Nl27o 21XoLh95dIraebycyKAwYHR01eprygY/uzVX44idRKPAg4mE66iJtz7YX/UNT+wg0uSM ZsMA== X-Gm-Message-State: ANhLgQ19AeKIFKM05zFTm1Mk1KqNZ0cfWpejTzc/NvrnxBogILMlgUs8 zuUpysos43FElmJc0J3sgkuHTg== X-Google-Smtp-Source: ADFU+vseyh17VfXtm5s8XV/149Ru55z0rlS2r6IKi9BXQPkbI7ngs8djZnIRVHc523Yyva6Lu3JQMQ== X-Received: by 2002:aa7:828e:: with SMTP id s14mr25576663pfm.15.1585006230564; Mon, 23 Mar 2020 16:30:30 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.154]) by smtp.gmail.com with ESMTPSA id j14sm2244008pgk.74.2020.03.23.16.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 16:30:29 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, Kieran Bingham , Helen Koike , Vaishali 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 parameterized StreamConfiguration X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 23:30:32 -0000 Replace default constructor StreamConfiguration() by it's parameterized counterpart by using StreamFormats in generateConfiguration() in rkisp1. Signed-off-by: Kaaira Gupta Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 39 ++++++++++++++++-------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 04b0ed3..cfbfc9e 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -218,6 +218,21 @@ private: Camera *activeCamera_; }; +namespace { + +static const std::array formats{ + PixelFormat(DRM_FORMAT_YUYV), + PixelFormat(DRM_FORMAT_YVYU), + PixelFormat(DRM_FORMAT_VYUY), + PixelFormat(DRM_FORMAT_NV16), + PixelFormat(DRM_FORMAT_NV61), + PixelFormat(DRM_FORMAT_NV21), + PixelFormat(DRM_FORMAT_NV12), + /* \todo Add support for 8-bit greyscale to DRM formats */ +}; + +} /* namespace */ + RkISP1Frames::RkISP1Frames(PipelineHandler *pipe) : pipe_(dynamic_cast(pipe)) { @@ -430,17 +445,6 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera, CameraConfiguration::Status RkISP1CameraConfiguration::validate() { - static const std::array formats{ - PixelFormat(DRM_FORMAT_YUYV), - PixelFormat(DRM_FORMAT_YVYU), - PixelFormat(DRM_FORMAT_VYUY), - PixelFormat(DRM_FORMAT_NV16), - PixelFormat(DRM_FORMAT_NV61), - PixelFormat(DRM_FORMAT_NV21), - PixelFormat(DRM_FORMAT_NV12), - /* \todo Add support for 8-bit greyscale to DRM formats */ - }; - const CameraSensor *sensor = data_->sensor_; Status status = Valid; @@ -541,7 +545,18 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera if (roles.empty()) return config; - StreamConfiguration cfg{}; + std::map> pixelformats; + for (PixelFormat pixelformat : formats) { + std::vector sizes{ + /* Minimum and maximum capabilities of ISP output */ + SizeRange{ { 32, 16 }, { 4416, 3312 } } + }; + pixelformats[pixelformat] = sizes; + } + + StreamFormats format(pixelformats); + StreamConfiguration cfg(format); + cfg.pixelFormat = PixelFormat(DRM_FORMAT_NV12); cfg.size = data->sensor_->resolution();