From patchwork Fri Apr 19 10:28:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1083 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DE8E60004 for ; Fri, 19 Apr 2019 12:29:07 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (unknown [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 10873333 for ; Fri, 19 Apr 2019 12:29:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1555669747; bh=+w+p2VuL/BLahLwZ8a8YeXYrc9sDt4hVviKmMNwGLWA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cOpAeD5PqykNAgjABimeuxj45Ggn7gwtQUEi1pZoY2svQJVqBw7N+/2AFw4jjpXZW 5HEwrzzBABbu/YfPbhK8Aq5/xu5vEmIZsxu4UdnSCVzdg6Kprqep/gI8TyMP8qO7nQ fmzvtpow5UZQVRuBrUofKOThvTxA9HFfpOOhOC/g= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Apr 2019 13:28:42 +0300 Message-Id: <20190419102844.6838-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419102844.6838-1-laurent.pinchart@ideasonboard.com> References: <20190419102844.6838-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/4] libcamera: pipeline: rkisp1: Don't hardcode NV12 in configureStreams() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Apr 2019 10:29:07 -0000 Use the pixel format requested by the application in the RkISP1PipelineHandler::configureStreams() method instead of hardcoding NV12. The streamsConfiguration() method still proposes NV12 by default. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 8ed0ba84780a..51f00fb68402 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -223,7 +223,7 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera, V4L2DeviceFormat outputFormat = {}; outputFormat.width = cfg.width; outputFormat.height = cfg.height; - outputFormat.fourcc = V4L2_PIX_FMT_NV12; + outputFormat.fourcc = cfg.pixelFormat; outputFormat.planesCount = 2; ret = video_->setFormat(&outputFormat); @@ -232,12 +232,12 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera, if (outputFormat.width != cfg.width || outputFormat.height != cfg.height || - outputFormat.fourcc != V4L2_PIX_FMT_NV12) { + outputFormat.fourcc != cfg.pixelFormat) { LOG(RkISP1, Error) << "Unable to configure capture in " << cfg.width << "x" << cfg.height << "-0x" << std::hex << std::setfill('0') << std::setw(8) - << V4L2_PIX_FMT_NV12; + << cfg.pixelFormat; return -EINVAL; }