{"id":9666,"url":"https://patchwork.libcamera.org/api/patches/9666/?format=json","web_url":"https://patchwork.libcamera.org/patch/9666/","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":"<20200918135041.91492-9-jacopo@jmondi.org>","date":"2020-09-18T13:50:41","name":"[libcamera-devel,v2,8/8] android: camera_device: Add stream mapping log","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"14c79e97abe06e59e77d76196e797887af0c3e66","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9666/mbox/","series":[{"id":1296,"url":"https://patchwork.libcamera.org/api/series/1296/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1296","date":"2020-09-18T13:50:33","name":"android: camera_device: Add support for internal buffers","version":2,"mbox":"https://patchwork.libcamera.org/series/1296/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9666/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9666/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 6AA4EBF01C\n\tfor ;\n\tFri, 18 Sep 2020 13:47:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 474D662FCB;\n\tFri, 18 Sep 2020 15:47:29 +0200 (CEST)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 178A862F4F\n\tfor ;\n\tFri, 18 Sep 2020 15:47:26 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id E072940006;\n\tFri, 18 Sep 2020 13:47:24 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 18 Sep 2020 15:50:41 +0200","Message-Id":"<20200918135041.91492-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200918135041.91492-1-jacopo@jmondi.org>","References":"<20200918135041.91492-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 8/8] android: camera_device: Add stream\n\tmapping log","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","Cc":"hanlinchen@chromium.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"To ease following how Android stream gets mapped onto libcamera ones\nadd a (quite verbose) printout before queueing a request to libcamera.\n\nThe output looks like:\n 0 - (320x240)[0x00000022] -> (320x240)[NV12] (external)\n 1 - (640x480)[0x00000021] -> (640x480)[NV12] (internal)\n\nReviewed-by: Hirokazu Honda \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 21 +++++++++++++++++----\n 1 file changed, 17 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex f7e9a1e5f494..a442495563a6 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1474,9 +1474,12 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tRequest *request =\n \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n \n+\tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n+\t\t\t<< descriptor->numBuffers << \" streams\";\n \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n+\t\tcamera3_stream *camera3Stream = camera3Buffers[i].stream;\n \t\tCameraStream *cameraStream =\n-\t\t\tstatic_cast(camera3Buffers[i].stream->priv);\n+\t\t\tstatic_cast(camera3Stream->priv);\n \t\tconst StreamConfiguration &config = config_->at(cameraStream->index());\n \t\tStream *stream = config.stream();\n \n@@ -1487,9 +1490,18 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tdescriptor->buffers[i].stream = camera3Buffers[i].stream;\n \t\tdescriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n \n-\t\t/* Mapped streams don't need to be added to the Request. */\n-\t\tif (cameraStream->type() == CameraStream::Type::Mapped)\n+\t\tstd::stringstream ss;\n+\t\tss << i << \" - (\"\n+\t\t << camera3Stream->width << \"x\" << camera3Stream->height << \")\"\n+\t\t << \"[\" << utils::hex(camera3Stream->format) << \"] -> \"\n+\t\t << \"(\" << config.size.toString() << \")[\"\n+\t\t << config.pixelFormat.toString() << \"]\";\n+\n+\t\t/* Mapped streams don't need buffers added to the Request. */\n+\t\tif (cameraStream->type() == CameraStream::Type::Mapped) {\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (mapped)\";\n \t\t\tcontinue;\n+\t\t}\n \n \t\tFrameBuffer *buffer;\n \t\tif (cameraStream->type() == CameraStream::Type::Direct) {\n@@ -1501,7 +1513,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t */\n \t\t\tbuffer = createFrameBuffer(*camera3Buffers[i].buffer);\n \t\t\tdescriptor->frameBuffers.emplace_back(buffer);\n-\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (external)\";\n \t\t} else {\n \t\t\t/*\n \t\t\t * Get the frame buffer from the CameraStream internal\n@@ -1513,6 +1525,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * allocator once it has been processed.\n \t\t\t */\n \t\t\tbuffer = getBuffer(stream);\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \t\t}\n \t\tif (!buffer) {\n \t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n","prefixes":["libcamera-devel","v2","8/8"]}