[{"id":2097,"web_url":"https://patchwork.libcamera.org/comment/2097/","msgid":"<20190701224416.GD11004@bigcity.dyn.berto.se>","date":"2019-07-01T22:44:16","subject":"Re: [libcamera-devel] [RFC 5/8] libcamera: request: Rename the\n\tStream to Buffer map","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 2019-06-30 20:10:46 +0200, Jacopo Mondi wrote:\n> As we're about to add support for mapping application buffers to\n> streams' ones, rename the existing bufferMap_ to just buffers_, which\n> also matches the associated accessor operation name.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> include/libcamera/request.h | 4 ++--\n> src/libcamera/camera.cpp | 2 +-\n> src/libcamera/request.cpp | 16 ++++++++--------\n> 3 files changed, 11 insertions(+), 11 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 58de6f00a554..7adb753b2706 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -32,7 +32,7 @@ public:\n> \tRequest(const Request &) = delete;\n> \tRequest &operator=(const Request &) = delete;\n> \n> -\tconst std::map &buffers() const { return bufferMap_; }\n> +\tconst std::map &buffers() const { return buffers_; }\n> \tint setBuffers(const std::map &streamMap);\n> \tBuffer *findBuffer(Stream *stream) const;\n> \n> @@ -50,7 +50,7 @@ private:\n> \tbool completeBuffer(Buffer *buffer);\n> \n> \tCamera *camera_;\n> -\tstd::map bufferMap_;\n> +\tstd::map buffers_;\n> \tstd::unordered_set pending_;\n> \n> \tStatus status_;\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index a71b44b82ea0..4b66d6216950 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -883,7 +883,7 @@ int Camera::stop()\n> */\n> void Camera::requestComplete(Request *request)\n> {\n> -\tstd::map buffers(std::move(request->bufferMap_));\n> +\tstd::map buffers(std::move(request->buffers_));\n> \trequestCompleted.emit(request, buffers);\n> \tdelete request;\n> }\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index fa3ee46da440..def7f2f21dc7 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -70,20 +70,20 @@ Request::Request(Camera *camera)\n> */\n> int Request::setBuffers(const std::map &streamMap)\n> {\n> -\tif (!bufferMap_.empty()) {\n> +\tif (!buffers_.empty()) {\n> \t\tLOG(Request, Error) << \"Buffers already set\";\n> \t\treturn -EBUSY;\n> \t}\n> \n> -\tbufferMap_ = streamMap;\n> +\tbuffers_ = streamMap;\n> \treturn 0;\n> }\n> \n> /**\n> - * \\var Request::bufferMap_\n> + * \\var Request::buffers_\n> * \\brief Mapping of streams to buffers for this request\n> *\n> - * The bufferMap_ tracks the buffers associated with each stream. If a stream is\n> + * The buffers_ tracks the buffers associated with each stream. If a stream is\n> * not utilised in this request there will be no buffer for that stream in the\n> * map.\n> */\n> @@ -96,8 +96,8 @@ int Request::setBuffers(const std::map &streamMap)\n> */\n> Buffer *Request::findBuffer(Stream *stream) const\n> {\n> -\tauto it = bufferMap_.find(stream);\n> -\tif (it == bufferMap_.end())\n> +\tauto it = buffers_.find(stream);\n> +\tif (it == buffers_.end())\n> \t\treturn nullptr;\n> \n> \treturn it->second;\n> @@ -134,12 +134,12 @@ Buffer *Request::findBuffer(Stream *stream) const\n> */\n> int Request::prepare()\n> {\n> -\tif (bufferMap_.empty()) {\n> +\tif (buffers_.empty()) {\n> \t\tLOG(Request, Error) << \"Invalid request due to missing buffers\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\tfor (auto const &pair : bufferMap_) {\n> +\tfor (auto const &pair : buffers_) {\n> \t\tBuffer *buffer = pair.second;\n> \t\tbuffer->setRequest(this);\n> \t\tpending_.insert(buffer);\n> -- \n> 2.21.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":"","Received":["from mail-lf1-x132.google.com (mail-lf1-x132.google.com\n\t[IPv6:2a00:1450:4864:20::132])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A0B9160BF8\n\tfor ;\n\tTue, 2 Jul 2019 00:44:18 +0200 (CEST)","by mail-lf1-x132.google.com with SMTP id y17so9916620lfe.0\n\tfor ;\n\tMon, 01 Jul 2019 15:44:18 -0700 (PDT)","from localhost (customer-145-14-112-32.stosn.net. [145.14.112.32])\n\tby smtp.gmail.com with ESMTPSA id\n\tc19sm2672626lfi.39.2019.07.01.15.44.17\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tMon, 01 Jul 2019 15:44:17 -0700 (PDT)"],"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\t:user-agent; bh=kIUVN4PQvH7dNfgTXmxis2jm2rEU/fcHsPXMywZQxdo=;\n\tb=m7V2oFz0ExejSyk1EAWDhDS614Q8VulRa4JAfmsvLu0tL22gw22kxt/tMc76zVy2Xk\n\twT+d6GCp95///pTQPAtYi35WPCbg2jA5JuqH5vXlx2PaKbvOydk2EaA8b32nERtqVok5\n\tkJtdpqleBQPIDtzthZ18I542mA0wskUkXJFL5JGYHO4AwDpn4lR7htibo/GUFnJzR1N/\n\tQLhYuvbT0G/y1q9ESHyCNljoB2UO4br4BJLLgIp3yi94WhzJvLjOJfyd6af/4Xhip3VS\n\tkWMoLrARfmkBMUFnliAzASmTB5cS8/kHOXfeMpNxHoUNO4M4pdfgbWnf7xYM/fmjc3lk\n\tN0Cw==","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:user-agent;\n\tbh=kIUVN4PQvH7dNfgTXmxis2jm2rEU/fcHsPXMywZQxdo=;\n\tb=DvxMXvuEOxj6Aj97A/XnIwGczcGwGLc492DJ4iOFJJiTE5vqPs24hWVsUse5XLEh9A\n\tiaFwAuk9QO83AlFw+stWBGR03su0ZRSkms5eQ6SweBcYMaS25AchZfYT13J7nnEY1tnF\n\tSXUFMwZ+k8dwRQq/lCZSDu791+xpa7yEzNItL1NmOSfuX8P2ogB2UyfaKwwE7hmTHRxv\n\tPZSCQdjQLWK2TdLo5tGiVFGKClqd9ouUVoLPb7gAK8ZxfmDUgc7ycxVPry+iAurZMoS7\n\tQSdCMPa4EBWXIZWthjhEbp08j9mCMtpq+COnwg38Q2//mCAaPzEPM8wy7yKZxSnG5TZK\n\tlItA==","X-Gm-Message-State":"APjAAAWbCyUHwGwdzhC+ekXSavExFeYUl7IQ+R0LehEKbFSlQ5oumYgS\n\t5GYp5KQzwSXX6zv9gnH+cxmuiA==","X-Google-Smtp-Source":"APXvYqycKvRx/SP9wbe/e0d+ISt1UjtcGb8Hf9TxR4dpsf+WuUMoCfuSVzFaYEFXvqah7XQDovuoQA==","X-Received":"by 2002:ac2:5324:: with SMTP id\n\tf4mr12971685lfh.156.1562021058082; \n\tMon, 01 Jul 2019 15:44:18 -0700 (PDT)","Date":"Tue, 2 Jul 2019 00:44:16 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190701224416.GD11004@bigcity.dyn.berto.se>","References":"<20190630181049.9548-1-jacopo@jmondi.org>\n\t<20190630181049.9548-6-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190630181049.9548-6-jacopo@jmondi.org>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [RFC 5/8] libcamera: request: Rename the\n\tStream to Buffer map","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 01 Jul 2019 22:44:18 -0000"}}]