[{"id":13021,"web_url":"https://patchwork.libcamera.org/comment/13021/","msgid":"<7ac98306-872a-9c7d-3a4b-da787b631df0@ideasonboard.com>","date":"2020-10-06T20:01:00","subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 06/10/2020 15:44, Jacopo Mondi wrote:\n> Now that CameraStream that require internal memory allocation\n> have been instrumented with a FrameBuffer pool, use them to create\n> intermediate buffers in the CameraDevice.\n\nReviewed-by: Kieran Bingham \n\n> Reviewed-by: Laurent Pinchart \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 51 ++++++++++++++++++++++++++++-------\n> 1 file changed, 41 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index ecdc0922e90b..b2fec7040038 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1387,24 +1387,48 @@ 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/* Software streams are handled after hardware streams complete. */\n> -\t\tif (cameraStream->camera3Stream().format == HAL_PIXEL_FORMAT_BLOB)\n> -\t\t\tcontinue;\n> -\n> \t\t/*\n> -\t\t * Create a libcamera buffer using the dmabuf descriptors of\n> -\t\t * the camera3Buffer for each stream. The FrameBuffer is\n> -\t\t * directly associated with the Camera3RequestDescriptor for\n> -\t\t * lifetime management only.\n> +\t\t * Inspect the camera stream type, create buffers opportunely\n> +\t\t * and add them to the Request if required.\n> \t\t */\n> -\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\tFrameBuffer *buffer;\n> +\t\tswitch (cameraStream->type()) {\n> +\t\tcase CameraStream::Type::Mapped:\n> +\t\t\t/*\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\tcontinue;\n> +\n> +\t\tcase CameraStream::Type::Direct:\n> +\t\t\t/*\n> +\t\t\t * Create a libcamera buffer using the dmabuf\n> +\t\t\t * descriptors of the camera3Buffer for each stream and\n> +\t\t\t * associate it with the Camera3RequestDescriptor for\n> +\t\t\t * lifetime management only.\n> +\t\t\t */\n> +\t\t\tbuffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> +\t\t\tbreak;\n> +\n> +\t\tcase CameraStream::Type::Internal:\n> +\t\t\t/*\n> +\t\t\t * Get the frame buffer from the CameraStream internal\n> +\t\t\t * buffer pool.\n> +\t\t\t *\n> +\t\t\t * The buffer has to be returned to the CameraStream\n> +\t\t\t * once it has been processed.\n> +\t\t\t */\n> +\t\t\tbuffer = cameraStream->getBuffer();\n> +\t\t\tbreak;\n> +\t\t}\n> +\n> \t\tif (!buffer) {\n> \t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> \t\t\tdelete request;\n> \t\t\tdelete descriptor;\n> \t\t\treturn -ENOMEM;\n> \t\t}\n> -\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> \n> \t\trequest->addBuffer(cameraStream->stream(), buffer);\n> \t}\n> @@ -1476,6 +1500,13 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> \t\t\tcontinue;\n> \t\t}\n> +\n> +\t\t/*\n> +\t\t * Return the FrameBuffer to the CameraStream now that we're\n> +\t\t * done processing it.\n> +\t\t */\n> +\t\tif (cameraStream->type() == CameraStream::Type::Internal)\n> +\t\t\tcameraStream->putBuffer(buffer);\n> \t}\n> \n> \t/* Prepare to call back the Android camera stack. */\n>","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 E7AF7BEEDF\n\tfor ;\n\tTue, 6 Oct 2020 20:01:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7D45C63BD5;\n\tTue, 6 Oct 2020 22:01:06 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4355360363\n\tfor ;\n\tTue, 6 Oct 2020 22:01:04 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B3D901452;\n\tTue, 6 Oct 2020 22:01:03 +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=\"qGtlEr4I\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602014463;\n\tbh=+zD0i230WWJTiECk95siImHOMRPKy00LrPMOvkZsjSM=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=qGtlEr4I5AICwLaRt5q4JSJ8Y6XzqbA88+pc79GHmF+vBX7W3e+e87nw03oeZy36V\n\tS3095xsKohfJ5dKa9HEgwE3vKhmDflSbNvAEFYu4Pq32a7yI0hUHlavT2GBs2jYcKF\n\t5X+mI0v9yz4piMbQylJJkmygnd/xzf5dH7hYJBZk=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-12-jacopo@jmondi.org>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<7ac98306-872a-9c7d-3a4b-da787b631df0@ideasonboard.com>","Date":"Tue, 6 Oct 2020 21:01:00 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201006144432.22908-12-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":13033,"web_url":"https://patchwork.libcamera.org/comment/13033/","msgid":"","date":"2020-10-07T08:05:17","subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/","name":"Umang Jain","email":"email@uajain.com"},"content":"Hi Jacopo,\n\nOn 10/6/20 8:14 PM, Jacopo Mondi wrote:\n> Now that CameraStream that require internal memory allocation\n> have been instrumented with a FrameBuffer pool, use them to create\n> intermediate buffers in the CameraDevice.\n>\n> Reviewed-by: Laurent Pinchart \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 51 ++++++++++++++++++++++++++++-------\n> 1 file changed, 41 insertions(+), 10 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index ecdc0922e90b..b2fec7040038 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1387,24 +1387,48 @@ 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/* Software streams are handled after hardware streams complete. */\n> -\t\tif (cameraStream->camera3Stream().format == HAL_PIXEL_FORMAT_BLOB)\n> -\t\t\tcontinue;\n> -\n> \t\t/*\n> -\t\t * Create a libcamera buffer using the dmabuf descriptors of\n> -\t\t * the camera3Buffer for each stream. The FrameBuffer is\n> -\t\t * directly associated with the Camera3RequestDescriptor for\n> -\t\t * lifetime management only.\n> +\t\t * Inspect the camera stream type, create buffers opportunely\n> +\t\t * and add them to the Request if required.\n> \t\t */\n> -\t\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\tFrameBuffer *buffer;\nI would not leave this un-initialize and initialize this to nullptr \nanyway (So that the `if (!buffer)` below is more tight). For now, buffer \nwill get automatically get assigned to nullptr in the relevant \nswitch-case-block on any errors though, so this is not really a blocker.\n\nThanks.\nReviewed-by: Umang Jain \n> +\t\tswitch (cameraStream->type()) {\n> +\t\tcase CameraStream::Type::Mapped:\n> +\t\t\t/*\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\tcontinue;\n> +\n> +\t\tcase CameraStream::Type::Direct:\n> +\t\t\t/*\n> +\t\t\t * Create a libcamera buffer using the dmabuf\n> +\t\t\t * descriptors of the camera3Buffer for each stream and\n> +\t\t\t * associate it with the Camera3RequestDescriptor for\n> +\t\t\t * lifetime management only.\n> +\t\t\t */\n> +\t\t\tbuffer = createFrameBuffer(*camera3Buffers[i].buffer);\n> +\t\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> +\t\t\tbreak;\n> +\n> +\t\tcase CameraStream::Type::Internal:\n> +\t\t\t/*\n> +\t\t\t * Get the frame buffer from the CameraStream internal\n> +\t\t\t * buffer pool.\n> +\t\t\t *\n> +\t\t\t * The buffer has to be returned to the CameraStream\n> +\t\t\t * once it has been processed.\n> +\t\t\t */\n> +\t\t\tbuffer = cameraStream->getBuffer();\n> +\t\t\tbreak;\n> +\t\t}\n> +\n> \t\tif (!buffer) {\n> \t\t\tLOG(HAL, Error) << \"Failed to create buffer\";\n> \t\t\tdelete request;\n> \t\t\tdelete descriptor;\n> \t\t\treturn -ENOMEM;\n> \t\t}\n> -\t\tdescriptor->frameBuffers.emplace_back(buffer);\n> \n> \t\trequest->addBuffer(cameraStream->stream(), buffer);\n> \t}\n> @@ -1476,6 +1500,13 @@ void CameraDevice::requestComplete(Request *request)\n> \t\t\tstatus = CAMERA3_BUFFER_STATUS_ERROR;\n> \t\t\tcontinue;\n> \t\t}\n> +\n> +\t\t/*\n> +\t\t * Return the FrameBuffer to the CameraStream now that we're\n> +\t\t * done processing it.\n> +\t\t */\n> +\t\tif (cameraStream->type() == CameraStream::Type::Internal)\n> +\t\t\tcameraStream->putBuffer(buffer);\n> \t}\n> \n> \t/* Prepare to call back the Android camera stack. */","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 2A3F6BEEE0\n\tfor ;\n\tWed, 7 Oct 2020 08:05:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ED97163C89;\n\tWed, 7 Oct 2020 10:05:22 +0200 (CEST)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E4FB63B27\n\tfor ;\n\tWed, 7 Oct 2020 10:05:21 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"Zm3c3kDd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1602057921; bh=13h5IAhwzAlfxVAScStkzOzffQ739SonPJ4b/n4e8IY=;\n\th=Subject:To:References:From:In-Reply-To;\n\tb=Zm3c3kDd5jQZsHzmwmdWrDJoNMyZ2hiVvk7qjSSoNcyTy+ZkLZu4sgo8S6a2VOmqz\n\t2nV44m+dOYTSM50/cQkCePqhZVFPaz3S19ByfG4+IlsYTlT9164y+X03KJz6r+pHxq\n\thtTSn75Tv3bxCuPs7BtylHjBKGANrGEAin1eX/4IrNqidTUyKgJOx96jOpBp64JlaK\n\tyxUBP3H6S7sjAf6tv/cG32HhmKSsX0xbBk+wTJuAyr7clguboZhF4+G4T4jJUy0o/L\n\tamrmd4l1BJFQegCVwcRYqgKZBUjxAgtXsIg5VQysJ36yQJZqpNbYb/JGoxl8j++V+c\n\tGxOx9ImfT1A5w==","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-12-jacopo@jmondi.org>","From":"Umang Jain ","Message-ID":"","Date":"Wed, 7 Oct 2020 13:35:17 +0530","Mime-Version":"1.0","In-Reply-To":"<20201006144432.22908-12-jacopo@jmondi.org>","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","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-Transfer-Encoding":"7bit","Content-Type":"text/plain; charset=\"us-ascii\"; Format=\"flowed\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":13037,"web_url":"https://patchwork.libcamera.org/comment/13037/","msgid":"<9c5f4914-b7c7-9e78-b5e7-9fb333e0cc41@ideasonboard.com>","date":"2020-10-07T09:01:47","subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hello,\n\nOn 07/10/2020 09:05, Umang Jain wrote:\n> Hi Jacopo,\n> \n> On 10/6/20 8:14 PM, Jacopo Mondi wrote:\n>> Now that CameraStream that require internal memory allocation\n>> have been instrumented with a FrameBuffer pool, use them to create\n>> intermediate buffers in the CameraDevice.\n>>\n>> Reviewed-by: Laurent Pinchart \n>> Signed-off-by: Jacopo Mondi \n>> ---\n>>   src/android/camera_device.cpp | 51 ++++++++++++++++++++++++++++-------\n>>   1 file changed, 41 insertions(+), 10 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp\n>> b/src/android/camera_device.cpp\n>> index ecdc0922e90b..b2fec7040038 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -1387,24 +1387,48 @@ int\n>> CameraDevice::processCaptureRequest(camera3_capture_request_t\n>> *camera3Reques\n>>           descriptor->buffers[i].stream = camera3Buffers[i].stream;\n>>           descriptor->buffers[i].buffer = camera3Buffers[i].buffer;\n>>   -        /* Software streams are handled after hardware streams\n>> complete. */\n>> -        if (cameraStream->camera3Stream().format ==\n>> HAL_PIXEL_FORMAT_BLOB)\n>> -            continue;\n>> -\n>>           /*\n>> -         * Create a libcamera buffer using the dmabuf descriptors of\n>> -         * the camera3Buffer for each stream. The FrameBuffer is\n>> -         * directly associated with the Camera3RequestDescriptor for\n>> -         * lifetime management only.\n>> +         * Inspect the camera stream type, create buffers opportunely\n>> +         * and add them to the Request if required.\n>>            */\n>> -        FrameBuffer *buffer =\n>> createFrameBuffer(*camera3Buffers[i].buffer);\n>> +        FrameBuffer *buffer;\n> I would not leave this un-initialize and initialize this to nullptr\n> anyway (So that the `if (!buffer)` below is more tight). For now, buffer\n> will get automatically get assigned to nullptr in the relevant\n> switch-case-block on any errors though, so this is not really a blocker.\n> \n\nGood spot.\n\nIndeed, this doesn't get used uninitialised, as the\nCameraStream::Type::Mapped will hit the continue statement, but I think\ninitialisign to nullptr would be safer code, protecting against any\nfuture changes in here that might occur.\n\nAgreed, not a blocker, but possibly a nice-to-have.\n--\nKieran\n\n\n> Thanks.\n> Reviewed-by: Umang Jain \n>> +        switch (cameraStream->type()) {\n>> +        case CameraStream::Type::Mapped:\n>> +            /*\n>> +             * Mapped streams don't need buffers added to the\n>> +             * Request.\n>> +             */\n>> +            continue;\n>> +\n>> +        case CameraStream::Type::Direct:\n>> +            /*\n>> +             * Create a libcamera buffer using the dmabuf\n>> +             * descriptors of the camera3Buffer for each stream and\n>> +             * associate it with the Camera3RequestDescriptor for\n>> +             * lifetime management only.\n>> +             */\n>> +            buffer = createFrameBuffer(*camera3Buffers[i].buffer);\n>> +            descriptor->frameBuffers.emplace_back(buffer);\n>> +            break;\n>> +\n>> +        case CameraStream::Type::Internal:\n>> +            /*\n>> +             * Get the frame buffer from the CameraStream internal\n>> +             * buffer pool.\n>> +             *\n>> +             * The buffer has to be returned to the CameraStream\n>> +             * once it has been processed.\n>> +             */\n>> +            buffer = cameraStream->getBuffer();\n>> +            break;\n>> +        }\n>> +\n>>           if (!buffer) {\n>>               LOG(HAL, Error) << \"Failed to create buffer\";\n>>               delete request;\n>>               delete descriptor;\n>>               return -ENOMEM;\n>>           }\n>> -        descriptor->frameBuffers.emplace_back(buffer);\n>>             request->addBuffer(cameraStream->stream(), buffer);\n>>       }\n>> @@ -1476,6 +1500,13 @@ void CameraDevice::requestComplete(Request\n>> *request)\n>>               status = CAMERA3_BUFFER_STATUS_ERROR;\n>>               continue;\n>>           }\n>> +\n>> +        /*\n>> +         * Return the FrameBuffer to the CameraStream now that we're\n>> +         * done processing it.\n>> +         */\n>> +        if (cameraStream->type() == CameraStream::Type::Internal)\n>> +            cameraStream->putBuffer(buffer);\n>>       }\n>>         /* Prepare to call back the Android camera stack. */\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 37BCBBEEE0\n\tfor ;\n\tWed, 7 Oct 2020 09:01:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C967863BE4;\n\tWed, 7 Oct 2020 11:01:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 25E036035F\n\tfor ;\n\tWed, 7 Oct 2020 11:01:50 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8A5B99DA;\n\tWed, 7 Oct 2020 11:01:49 +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=\"R/xm8q2G\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602061309;\n\tbh=n4HQYcH1kfij2PRiOb/NvuFLfTVQ6qEic8mo9J7jAIc=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=R/xm8q2GkrFzOQkhzqN2arP/ghLK6Vw0Ub+loMUohtY6XrjU4C8qrhSteEtag7rOL\n\txZh6XcBgCgtc9ANxx8WjltXVmP8Gu2Mb4xRN0amq1UkqbYuWTr0JeMYUgajyD8puUI\n\tehMBrfT4+bEv3PY35xwXh6SMbJ+eopATp+Qsdip4=","To":"Umang Jain , Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201006144432.22908-1-jacopo@jmondi.org>\n\t<20201006144432.22908-12-jacopo@jmondi.org>\n\t","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<9c5f4914-b7c7-9e78-b5e7-9fb333e0cc41@ideasonboard.com>","Date":"Wed, 7 Oct 2020 10:01:47 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 11/13] android: camera_device: Use\n\tCameraStream buffers","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]