[{"id":12259,"web_url":"https://patchwork.libcamera.org/comment/12259/","msgid":"<8c6a556c-3bbf-68a1-b388-eff96c041ecb@ideasonboard.com>","date":"2020-09-02T13:22:26","subject":"Re: [libcamera-devel] [RFC 2/7] android: camera_device: Get rid of\n\tstream counter","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 02/09/2020 14:08, Jacopo Mondi wrote:\n> Now that CameraConfiguration::addConfiguration() returns the index\n> of the newly added configuration, there's no need to use a custom\n> counter to keep track of the StreamConfiguration index associated with\n> a CameraStream.\n> \n> Signed-off-by: Jacopo Mondi \n\n\nThis makes me ... **** happy ****\n\nI wasn't fond of calculating this stream index, but it was just the only\nway I could track it - as I didn't think of returning the index! And now\nit looks obvious, and much cleaner.\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/android/camera_device.cpp | 13 ++-----------\n> 1 file changed, 2 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 181fca83988d..5a70db832aa5 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1195,12 +1195,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \tstreams_.clear();\n> \tstreams_.reserve(stream_list->num_streams);\n> \n> -\t/*\n> -\t * Track actually created streams, as there may not be a 1:1 mapping of\n> -\t * camera3 streams to libcamera streams.\n> -\t */\n> -\tunsigned int streamIndex = 0;\n> -\n> \t/* First handle all non-MJPEG streams. */\n> \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> \t\tcamera3_stream_t *stream = stream_list->streams[i];\n> @@ -1230,9 +1224,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfiguration.size = size;\n> \t\tstreamConfiguration.pixelFormat = format;\n> \n> -\t\tconfig_->addConfiguration(streamConfiguration);\n> -\n> -\t\tstreams_[i].index = streamIndex++;\n> +\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n> \t}\n> \n> \t/* Now handle MJPEG streams, adding a new stream if required. */\n> @@ -1280,8 +1272,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n> \t\t\t\t << \" for MJPEG support\";\n> \n> -\t\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\t\tstreams_[i].index = streamIndex++;\n> +\t\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n> \t\t}\n> \t}\n> \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 1DF67BE174\n\tfor ;\n\tWed, 2 Sep 2020 13:22:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AE2E862984;\n\tWed, 2 Sep 2020 15:22:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90EBF60374\n\tfor ;\n\tWed, 2 Sep 2020 15:22:30 +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 8B1119CC;\n\tWed, 2 Sep 2020 15:22:29 +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=\"G5+lPjqd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1599052949;\n\tbh=7L+RQ2p0bcKkQcJTyQLesWRWExupird8py5S6dROncg=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=G5+lPjqd1XFcYwLcZCNcBpgUBprnYf2GlWED50aHKMN5fgZSu7zY4pZNHba2JqW3U\n\t5mb/PXTOOvG42Ms7V6U0zL04nbVAfN1g0Y5ZRmc56iUYYKksTa10f+FQPhu6cPgxHF\n\t1Jqr7hdvg3NOOgEekTuWz8RRSowqn2ZvNFbiUV9g=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20200902130846.55910-1-jacopo@jmondi.org>\n\t<20200902130846.55910-3-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":"<8c6a556c-3bbf-68a1-b388-eff96c041ecb@ideasonboard.com>","Date":"Wed, 2 Sep 2020 14:22:26 +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":"<20200902130846.55910-3-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [RFC 2/7] android: camera_device: Get rid of\n\tstream counter","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","Cc":"tfiga@google.com, hiroh@google.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12289,"web_url":"https://patchwork.libcamera.org/comment/12289/","msgid":"<20200904061156.GD1498632@oden.dyn.berto.se>","date":"2020-09-04T06:11:56","subject":"Re: [libcamera-devel] [RFC 2/7] android: camera_device: Get rid of\n\tstream counter","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-02 15:08:41 +0200, Jacopo Mondi wrote:\n> Now that CameraConfiguration::addConfiguration() returns the index\n> of the newly added configuration, there's no need to use a custom\n> counter to keep track of the StreamConfiguration index associated with\n> a CameraStream.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 13 ++-----------\n> 1 file changed, 2 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 181fca83988d..5a70db832aa5 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1195,12 +1195,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \tstreams_.clear();\n> \tstreams_.reserve(stream_list->num_streams);\n> \n> -\t/*\n> -\t * Track actually created streams, as there may not be a 1:1 mapping of\n> -\t * camera3 streams to libcamera streams.\n> -\t */\n> -\tunsigned int streamIndex = 0;\n> -\n> \t/* First handle all non-MJPEG streams. */\n> \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> \t\tcamera3_stream_t *stream = stream_list->streams[i];\n> @@ -1230,9 +1224,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfiguration.size = size;\n> \t\tstreamConfiguration.pixelFormat = format;\n> \n> -\t\tconfig_->addConfiguration(streamConfiguration);\n> -\n> -\t\tstreams_[i].index = streamIndex++;\n> +\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n> \t}\n> \n> \t/* Now handle MJPEG streams, adding a new stream if required. */\n> @@ -1280,8 +1272,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n> \t\t\t\t << \" for MJPEG support\";\n> \n> -\t\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\t\tstreams_[i].index = streamIndex++;\n> +\t\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n> \t\t}\n> \t}\n> \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 13991BF019\n\tfor ;\n\tFri, 4 Sep 2020 06:11:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D6C7D6036F;\n\tFri, 4 Sep 2020 08:11:58 +0200 (CEST)","from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C66F6036F\n\tfor ;\n\tFri, 4 Sep 2020 08:11:57 +0200 (CEST)","by mail-lj1-x243.google.com with SMTP id t23so6581903ljc.3\n\tfor ;\n\tThu, 03 Sep 2020 23:11:57 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tt7sm1054179lji.131.2020.09.03.23.11.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 03 Sep 2020 23:11:56 -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=\"dEgbsoIX\"; 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=S2G9IQy9dK0tiiZgEtf+hQq/fMnervQQAM5UWemdhIM=;\n\tb=dEgbsoIXaqUiWhT2Kfpbr8c1lBNRVdiR043iL6yMA/JYNQlfzjici8Cyh/tMnD4c77\n\txweVIkV8Zk6q5/MSlY9VzRDnBZmJ3gL6P8eZ3aRpfKLFfc6oAgnGeqOtjTDJVuGPqx9C\n\tCzrvsvBTyq4LUf8UglSHjkGgMtLoCUqt/0acYyC8/n5l3/UAmyObkccIgbS+bvimTJ/H\n\tr/2IByqyRtzdUxIqkNroLAigfj9JrE2u8mY2ZdDdAVYlldIJ+tuv1uNCO2l4QFHfg/A3\n\tLjjd57fONeZ44SIrlGp28e7dezmqX00YPcvCC564ZHG7gr/maOvE4UxJK9QSm2YF8oFA\n\t4Syw==","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=S2G9IQy9dK0tiiZgEtf+hQq/fMnervQQAM5UWemdhIM=;\n\tb=q1srKP+oielnL86OdN6nPkatNTo5V6JKK8q6/NccHDRkQvAz6dqX5XEJjn6N5P3JLw\n\tdaT/DS6G4Pk0WQkZrPV59NJnzgdDNyep7uB+rpK2sKK1KIvEwG6/eIXCJQeS/1D/unRc\n\tP0OJh7pVp/MJFEYOXPOXIoA/Ghpsjpj/5k8apSztTZiT32pCHc3aEEldF1d0rlflxzx+\n\tJAFTtcqzkyyRysT2FUztpnXOc9mLVFkztlPO4lmLcg/L0KVkGB2c+LlqY4I7QyRxVXQs\n\tlEVw1qS0vr6fRhYzxpFlFk3h9bOehS9XTj1euKPd+ckhDRDREDNDuaFf6nBWjaM8yUhu\n\twvPw==","X-Gm-Message-State":"AOAM533rckfgKos5IrpaWrMijBZYvEFBpZ+KBNL+ajMVoakdMmvTmLLX\n\tIs/sZw+yu7/jUrb3DicfIaVilSAx/O7blg==","X-Google-Smtp-Source":"ABdhPJymPpEVfZuZVSHB3kfokuHzZyCthL68Rtr3/TzLdyGzzv99z18kXep46wHzq83lIaRGCoHXeA==","X-Received":"by 2002:a2e:8648:: with SMTP id i8mr3187194ljj.288.1599199916985;\n\tThu, 03 Sep 2020 23:11:56 -0700 (PDT)","Date":"Fri, 4 Sep 2020 08:11:56 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"<20200904061156.GD1498632@oden.dyn.berto.se>","References":"<20200902130846.55910-1-jacopo@jmondi.org>\n\t<20200902130846.55910-3-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200902130846.55910-3-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [RFC 2/7] android: camera_device: Get rid of\n\tstream counter","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":"tfiga@google.com, libcamera-devel@lists.libcamera.org, hiroh@google.com","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]