{"id":9692,"url":"https://patchwork.libcamera.org/api/1.1/patches/9692/?format=json","web_url":"https://patchwork.libcamera.org/patch/9692/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200922094738.5327-9-jacopo@jmondi.org>","date":"2020-09-22T09:47:38","name":"[libcamera-devel,v3,8/8] android: camera_device: Add stream mapping log","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a1fbe910ea40e043d0df4826e17c45f6fb5d6cef","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9692/mbox/","series":[{"id":1306,"url":"https://patchwork.libcamera.org/api/1.1/series/1306/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1306","date":"2020-09-22T09:47:30","name":"android: camera_device: Add support for internal buffers","version":3,"mbox":"https://patchwork.libcamera.org/series/1306/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9692/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9692/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 0716CBF01C\n\tfor ;\n\tTue, 22 Sep 2020 09:44:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D5DC462FD2;\n\tTue, 22 Sep 2020 11:44:51 +0200 (CEST)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 315C460364\n\tfor ;\n\tTue, 22 Sep 2020 11:44:50 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 59D28E0009;\n\tTue, 22 Sep 2020 09:44:41 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Sep 2020 11:47:38 +0200","Message-Id":"<20200922094738.5327-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200922094738.5327-1-jacopo@jmondi.org>","References":"<20200922094738.5327-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 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] (direct)\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 | 15 ++++++++++++++-\n 1 file changed, 14 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 1b35c72a3de6..316d8293843f 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,6 +1490,13 @@ 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\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/*\n \t\t * Inspect the camera stream type, create buffers opportunely\n \t\t * and add them to the Request if required.\n@@ -1498,6 +1508,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * Mapped streams don't need buffers added to the\n \t\t\t * Request.\n \t\t\t */\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (mapped)\";\n \t\t\tcontinue;\n \n \t\tcase CameraStream::Type::Direct:\n@@ -1509,6 +1520,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+\t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n \n \t\tcase CameraStream::Type::Internal:\n@@ -1522,6 +1534,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\tbreak;\n \t\t}\n \t\tif (!buffer) {\n","prefixes":["libcamera-devel","v3","8/8"]}