[{"id":12594,"web_url":"https://patchwork.libcamera.org/comment/12594/","msgid":"<20200920004213.GB2692107@oden.dyn.berto.se>","date":"2020-09-20T00:42:13","subject":"Re: [libcamera-devel] [PATCH v2 5/8] android: camera_device:\n\tAllocate buffer pools","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2020-09-18 15:50:38 +0200, Jacopo Mondi wrote:\n> After the Camera has been configured, walk the list of collected\n> CameraStream instances and allocate memory for the ones that needs\n> intermediate buffers reserved by the libcamera FrameBufferAllocator.\n> \n> Maintain a map between each Stream and a vector of pointers to the\n> associated buffers.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 36 +++++++++++++++++++++++++++++++++++\n> src/android/camera_device.h | 6 ++++++\n> 2 files changed, 42 insertions(+)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 42fb9ea4e113..f96ea7321a67 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1189,6 +1189,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \tstreams_.clear();\n> \tstreams_.reserve(stream_list->num_streams);\n> \tallocator_.clear();\n> +\tbufferPool_.clear();\n> \n> \t/* First handle all non-MJPEG streams. */\n> \tcamera3_stream_t *jpegStream = nullptr;\n> @@ -1336,6 +1337,25 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\treturn ret;\n> \t}\n> \n> +\t/*\n> +\t * Now that the camera has been configured allocate buffers for\n> +\t * the streams that need memory reserved by libcamera.\n> +\t */\n> +\tfor (const CameraStream &cameraStream : streams_) {\n> +\t\tconst StreamConfiguration &cfg = config_->at(cameraStream.index());\n> +\t\tStream *stream = cfg.stream();\n> +\n> +\t\tif (cameraStream.type() != CameraStream::Type::Internal)\n> +\t\t\tcontinue;\n> +\n> +\t\tret = allocateBuffersPool(stream);\n> +\t\tif (ret) {\n> +\t\t\tLOG(HAL, Error) << \"Failed to allocate buffers for stream \"\n> +\t\t\t\t\t<< cameraStream.index();\n> +\t\t\treturn ret;\n> +\t\t}\n> +\t}\n> +\n> \treturn 0;\n> }\n> \n> @@ -1369,6 +1389,22 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer\n> \treturn new FrameBuffer(std::move(planes));\n> }\n> \n> +int CameraDevice::allocateBuffersPool(Stream *stream)\n> +{\n> +\tint ret = allocator_.allocate(stream);\n> +\tif (ret < 0)\n> +\t\treturn ret;\n> +\n> +\t/*\n> +\t * Save a pointer to the reserved frame buffer for usage in\n> +\t * the HAL.\n> +\t */\n> +\tfor (const auto &frameBuffer : allocator_.buffers(stream))\n> +\t\tbufferPool_[stream].push_back(frameBuffer.get());\n> +\n> +\treturn 0;\n> +}\n> +\n> int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n> {\n> \tif (!camera3Request->num_output_buffers) {\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 84f636f7a93c..4cef34c01a49 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -166,6 +166,9 @@ protected:\n> \tstd::string logPrefix() const override;\n> \n> private:\n> +\tusing FrameBufferPool = std::map +\t\t\t\t\t std::vector>;\n> +\n> \tCameraDevice(unsigned int id, const std::shared_ptr &camera);\n> \n> \tstruct Camera3RequestDescriptor {\n> @@ -194,6 +197,8 @@ private:\n> \n> \tstd::tuple calculateStaticMetadataSize();\n> \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n> +\tint allocateBuffersPool(libcamera::Stream *stream);\n> +\n> \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> \tCameraMetadata *requestTemplatePreview();\n> @@ -208,6 +213,7 @@ private:\n> \tstd::shared_ptr camera_;\n> \tstd::unique_ptr config_;\n> \tlibcamera::FrameBufferAllocator allocator_;\n> +\tFrameBufferPool bufferPool_;\n> \n> \tCameraMetadata *staticMetadata_;\n> \tstd::map requestTemplates_;\n> -- \n> 2.28.0\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 2886AC3B5B\n\tfor ;\n\tSun, 20 Sep 2020 00:42:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8FC8062FBC;\n\tSun, 20 Sep 2020 02:42:17 +0200 (CEST)","from mail-lj1-x244.google.com (mail-lj1-x244.google.com\n\t[IPv6:2a00:1450:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A115362FAB\n\tfor ;\n\tSun, 20 Sep 2020 02:42:15 +0200 (CEST)","by mail-lj1-x244.google.com with SMTP id b19so8109791lji.11\n\tfor ;\n\tSat, 19 Sep 2020 17:42:15 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tw9sm1522563lfn.224.2020.09.19.17.42.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 19 Sep 2020 17:42:13 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"t/dctM+N\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=N/MeXaT3cRgVg8afbXxpBB2cT6qG2xcbNmwxW0wrxJA=;\n\tb=t/dctM+NfNUjrDY5i5kK8GSUmARCdIhRdY3l0t1uEnXAKZ7B+upcwQjiCfnr/ycJQG\n\t6OCO2M3VD6jYxj/vbn65k5HZYP2RGnSFGIfyb7QDEDtnFpFcVipdHw3wOKhl8MIgPar4\n\tf/B3YO+5DDEvJVp2StZg82yhJe8MpgZFAGDlk0S2mPceZgFsIFuCT+KAt9dE3Ng80jiO\n\tsAQ+Wwf+NLMYzKvzXE5RjABXJxJN1opbIKlTopcmrW2H+zln7iytr3sP8nIqROaspiBQ\n\tVW1AKZcUGkQRucWdaETb9Wk08u8Vf0f38JzMg7rBylCvzKaf/kIAagyO+ejCyqrHoIRF\n\tIhOw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=N/MeXaT3cRgVg8afbXxpBB2cT6qG2xcbNmwxW0wrxJA=;\n\tb=hU6b1Q7yxYcG/XV623mEOtvdjMCShrYibCQZtWiapqbV/6Hb6D94W/UWtcw2XcXI3X\n\tLuq8SXTkvp1ofzNLR8l7rGQTix6MZngkwtXypGuj5pgByRrGzCxVtF6KEpOtXeyGdewp\n\tCVDGw8v3AU1XAnFXzRKzVX8isxjh796HhTE33fztjiXO39slBa1DOJ4yzbDEnBrOaicr\n\tZJyYX809Yh8QJw98jFlhD/+rxvIpsfDlrKvf9Z9dZzu/vmoE1UfPGAuoFOuHPn3kuY/i\n\tlfKPGe+sidnUvQs2QS0j06V/4Im1Yj7qyotgnTS+gfUd5UVd3vDNdiurBLojyoY0dpIr\n\tSocw==","X-Gm-Message-State":"AOAM5339G9NOGr0DIPMjztwHN21hrf1ouhzEspdZI2yLxzMigrOelG3z\n\tljf0MUykh2rM98uHSzwZ2XvXMg==","X-Google-Smtp-Source":"ABdhPJxLsaYgRq/udzeDJrFQf7MYIVrXHPFaOhLdYAXOn8+CDawP7zh/IPxhIjt35ygtAkwD/ifkeQ==","X-Received":"by 2002:a2e:99d6:: with SMTP id\n\tl22mr9042088ljj.195.1600562534751; \n\tSat, 19 Sep 2020 17:42:14 -0700 (PDT)","Date":"Sun, 20 Sep 2020 02:42:13 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"<20200920004213.GB2692107@oden.dyn.berto.se>","References":"<20200918135041.91492-1-jacopo@jmondi.org>\n\t<20200918135041.91492-6-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200918135041.91492-6-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 5/8] android: camera_device:\n\tAllocate buffer pools","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, libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]