From patchwork Fri Apr 26 15:05:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1115 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 271D060E9A for ; Fri, 26 Apr 2019 17:05:51 +0200 (CEST) Received: from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it [37.182.44.227]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 948A85F for ; Fri, 26 Apr 2019 17:05:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1556291150; bh=PctbUfsEfBJfOBfOjz1CREI1S7cA/BDTA3HkrBBtfJU=; h=From:To:Subject:Date:From; b=YDxNJrZ5t8m44BIq9vyfzok5ZOlUy6SeJgruhSr8+cnOGax5+iCMg7gfvdyxNnlxT 25Imk5N0It71oTRZpM04HvMsi4TMHjQoPz5ag/bl13ePftOr6t3y7gop2fdaJKumDM 5QjAK/VNE0RApEVh+vxQvz88LFOz/IirMN0t0FSo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Apr 2019 18:05:37 +0300 Message-Id: <20190426150537.18848-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: camera: Log proposed configuration in streamConfiguration() 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, 26 Apr 2019 15:05:51 -0000 The IPU3 and RKISP1 pipeline handlers log the camera configuration they propose in their streamConfiguration() methods. Other pipeline handlers are expected to log similar information, move it to the Camera class. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/camera.cpp | 15 ++++++++++++++- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ---- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 -- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 655996f26224..a3c3945cf62d 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -546,7 +546,20 @@ Camera::streamConfiguration(const std::vector &usages) if (disconnected_ || !usages.size() || usages.size() > streams_.size()) return CameraConfiguration(); - return pipe_->streamConfiguration(this, usages); + CameraConfiguration config = pipe_->streamConfiguration(this, usages); + + std::ostringstream msg("streams configuration:"); + unsigned int index = 0; + + for (Stream *stream : config) { + const StreamConfiguration &cfg = config[stream]; + msg << " (" << index << ") " << cfg.toString(); + index++; + } + + LOG(Camera, Debug) << msg.str(); + + return config; } /** diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 97a309207621..fbb37498ca8a 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -316,10 +316,6 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera, streamConfig.bufferCount = IPU3_BUFFER_COUNT; cameraConfig[stream] = streamConfig; - - LOG(IPU3, Debug) - << "Stream '" << stream->name_ << "' format set to " - << streamConfig.toString(); } return cameraConfig; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index d21c6266c6ba..9a63a68b81dd 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -124,8 +124,6 @@ CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera, configs[&data->stream_] = config; - LOG(RkISP1, Debug) << "Stream format set to " << config.toString(); - return configs; }