{"id":9961,"url":"https://patchwork.libcamera.org/api/patches/9961/?format=json","web_url":"https://patchwork.libcamera.org/patch/9961/","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":"<20201005104649.10812-15-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:48","name":"[libcamera-devel,14/15] android: camera_device: Add stream mapping log","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d2462f72a75dabb33356bd59d3bd4de839bbab90","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9961/mbox/","series":[{"id":1349,"url":"https://patchwork.libcamera.org/api/series/1349/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1349","date":"2020-10-05T10:46:34","name":"CameraStream refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/1349/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9961/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9961/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 92AC4C3B5D\n\tfor ;\n\tMon, 5 Oct 2020 10:47:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5B93363C73;\n\tMon, 5 Oct 2020 12:47:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2907963C28\n\tfor ;\n\tMon, 5 Oct 2020 12:47:39 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AB2543B;\n\tMon, 5 Oct 2020 12:47:38 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"G4CePw2D\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894858;\n\tbh=9IH1UHV2WxoRxVolEa8kzkFzDF5R9flzDxiv7hb/0Ac=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G4CePw2Df4iQhYPE5rRKwrRxdp/kHlhJw40ySixY37mVtsiJPfrjrWzYN/3ZRoHtC\n\tkWrkL4eqEtOvYY8IisF9aRwf1m+LZ1x2IeLXg2bePz1imQTZAu/hgHJFYbtDtnqHmt\n\teLf/IyJNZHTL+ir5Wm10+F2wdCOQLybNtgy3rUh0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:48 +0300","Message-Id":"<20201005104649.10812-15-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 14/15] 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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Jacopo Mondi \n\nTo ease following how Android streams get mapped to 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: Laurent Pinchart \nReviewed-by: Hirokazu Honda \nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 13 +++++++++++++\n 1 file changed, 13 insertions(+)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 186c9f724c3e..1a9af2e34340 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1379,7 +1379,10 @@ 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 << \" HAL 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 \n@@ -1390,6 +1393,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 << \" - (\" << camera3Stream->width << \"x\"\n+\t\t << camera3Stream->height << \")\"\n+\t\t << \"[\" << utils::hex(camera3Stream->format) << \"] -> \"\n+\t\t << \"(\" << cameraStream->size().toString() << \")[\"\n+\t\t << cameraStream->format().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@@ -1401,6 +1411,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@@ -1412,6 +1423,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@@ -1423,6 +1435,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * once it has been processed.\n \t\t\t */\n \t\t\tbuffer = cameraStream->getBuffer();\n+\t\t\tLOG(HAL, Debug) << ss.str() << \" (internal)\";\n \t\t\tbreak;\n \t\t}\n \t\tif (!buffer) {\n","prefixes":["libcamera-devel","14/15"]}