From patchwork Mon Apr 8 13:50:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 953 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2F34360B2E for ; Mon, 8 Apr 2019 15:50:55 +0200 (CEST) X-Halon-ID: 4d1f2556-5a05-11e9-846a-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 4d1f2556-5a05-11e9-846a-005056917a89; Mon, 08 Apr 2019 15:50:48 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 8 Apr 2019 15:50:05 +0200 Message-Id: <20190408135006.15423-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190408135006.15423-1-niklas.soderlund@ragnatech.se> References: <20190408135006.15423-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 4/5] cam: Extend request completion handler to deal with multiple streams 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: Mon, 08 Apr 2019 13:50:55 -0000 The completion handler needs to handle all buffers in the request. Solve this by iterating over all buffers in the completed request. The streams are named automatically streamX, where X is the order of which the stream was passed to configureStream(). Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- src/cam/main.cpp | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index ac4c7e78c597a2c5..337933d412451e20 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -23,6 +24,7 @@ using namespace libcamera; OptionsParser::Options options; std::shared_ptr camera; +std::map streamInfo; EventLoop *loop; BufferWriter *writer; @@ -87,9 +89,12 @@ static int prepareCameraConfig(CameraConfiguration *config) { std::vector roles; + streamInfo.clear(); + /* If no configuration is provided assume a single video stream. */ if (!options.isSet(OptStream)) { *config = camera->streamConfiguration({ Stream::VideoRecording() }); + streamInfo[config->front()] = "stream0"; return 0; } @@ -142,31 +147,48 @@ static int prepareCameraConfig(CameraConfiguration *config) (*config)[stream].pixelFormat = conf["pixelformat"]; } + unsigned int index = 0; + for (Stream *stream : *config) { + streamInfo[stream] = "stream" + std::to_string(index); + index++; + } + return 0; } static void requestComplete(Request *request, const std::map &buffers) { - static uint64_t last = 0; + static uint64_t now, last = 0; + double fps = 0.0; if (request->status() == Request::RequestCancelled) return; - Buffer *buffer = buffers.begin()->second; + struct timespec time; + clock_gettime(CLOCK_MONOTONIC, &time); + now = time.tv_sec * 1000 + time.tv_nsec / 1000000; + fps = now - last; + fps = last && fps ? 1000.0 / fps : 0.0; + last = now; - double fps = buffer->timestamp() - last; - fps = last && fps ? 1000000000.0 / fps : 0.0; - last = buffer->timestamp(); + std::stringstream info; + info << "fps: " << std::fixed << std::setprecision(2) << fps; - std::cout << "seq: " << std::setw(6) << std::setfill('0') << buffer->sequence() - << " buf: " << buffer->index() - << " bytesused: " << buffer->bytesused() - << " timestamp: " << buffer->timestamp() - << " fps: " << std::fixed << std::setprecision(2) << fps - << std::endl; + for (auto it = buffers.begin(); it != buffers.end(); ++it) { + Stream *stream = it->first; + Buffer *buffer = it->second; + std::string name = streamInfo[stream]; - if (writer) - writer->write(buffer, "stream0"); + info << " " << name + << " (" << buffer->index() << ")" + << " seq: " << std::setw(6) << std::setfill('0') << buffer->sequence() + << " bytesused: " << buffer->bytesused(); + + if (writer) + writer->write(buffer, name); + } + + std::cout << info.str() << std::endl; request = camera->createRequest(); if (!request) {