[{"id":12409,"web_url":"https://patchwork.libcamera.org/comment/12409/","msgid":"<20200910105125.GH4095624@oden.dyn.berto.se>","date":"2020-09-10T10:51:25","subject":"Re: [libcamera-devel] [PATCH v3 06/11] android: camera_device: Get\n\trid of stream 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-08 15:41:37 +0200, Jacopo Mondi wrote:\n> Use the size() method of the CameraConfiguration class to retrieve the\n> index of the StreamConfiguration associated with a CameraStream and get\n> rid of the custom counter.\n> \n> Acked-by: Laurent Pinchart \n> Reviewed-by: Kieran Bingham \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 11 ++---------\n> 1 file changed, 2 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 5f4b95987615..562cbb3c415e 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1189,12 +1189,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> @@ -1225,8 +1219,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfiguration.pixelFormat = format;\n> \n> \t\tconfig_->addConfiguration(streamConfiguration);\n> -\n> -\t\tstreams_[i].index = streamIndex++;\n> +\t\tstreams_[i].index = config_->size() - 1;\n> \t}\n> \n> \t/* Now handle MJPEG streams, adding a new stream if required. */\n> @@ -1275,7 +1268,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\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_->size() - 1;\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 58CF8C3B5B\n\tfor ;\n\tThu, 10 Sep 2020 10:51:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EAD6662D38;\n\tThu, 10 Sep 2020 12:51:27 +0200 (CEST)","from mail-lj1-x241.google.com (mail-lj1-x241.google.com\n\t[IPv6:2a00:1450:4864:20::241])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0D65E62C8C\n\tfor ;\n\tThu, 10 Sep 2020 12:51:27 +0200 (CEST)","by mail-lj1-x241.google.com with SMTP id u4so7508366ljd.10\n\tfor ;\n\tThu, 10 Sep 2020 03:51:27 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\t206sm1267546lfd.72.2020.09.10.03.51.25\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 10 Sep 2020 03:51:26 -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=\"1rpCnxPN\"; 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=yNw0HSp0Y17Be9ZjjmitTWFPhF4RCCTQA3XlDG3UgmE=;\n\tb=1rpCnxPNRmL9b5H+m0SFFKd7WxU6l4PL50brzr45Iq+fOOW1fm8w8gcVom1H0MLvwz\n\tvuVoItQxOIvhr9hzsaxCpybYf3Y2oPwIEgGbSeOhU8q40QmU0FaAf+cURCO2w4VMPeS2\n\ts3b/IIQt2aCrF0ygGxVHJOeix4QL17y4NleBQi0VjWW4OPb+LnVIczmZf60Bt9FcRva0\n\trmMAEgbyXdK/3ak20GHvNzBiC2vzFQGRKQrmlF+xYvc86WNERnV3Nl+HDcKjh5Wji+Cn\n\tDteGk82MFMj9Y1OExeld3MCi3bzfiF8nuDXBYHFeFgtwW1OqEttUhunhVvlK4P0TGBT+\n\tuQEw==","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=yNw0HSp0Y17Be9ZjjmitTWFPhF4RCCTQA3XlDG3UgmE=;\n\tb=oZbTPDklGg+wmFkGtG/Qzn5YhmkYaU8eh3BeL9zkOK1PTdDgxb6MxEXJZirIlW85U5\n\t0X5WiDKVL+/3whHNbh841GZYBynCxeYZ3wrrRbWUUz1ufFmXMasGIrggECatrYeJy0+E\n\tlxxN81yc8dVsnxOkCJCgtJCwU9fuPeFxMi3Ra+fV3KBbRT9ewr8w02cWQK/QhcUUl9V6\n\thbZVzzVykmSPX9/cEGzjo2tGDBhx48XJ/76WbkzGy3mMjkzlS2dx1LgNBvuuM+Mo+j2k\n\tCMU30z9tURwYqRjJurKgxjEeV4Jtv4o+bExiOBYdEiHwfJmGTDz1ZIjZum5LttpB8U7t\n\tb83w==","X-Gm-Message-State":"AOAM530EVw1uRbtkXw2oGCmwKZZyxpCKmzGhPHWU4k5H8hZQ09rcw9kz\n\t85bg2VHlQTmLXWTtsgkllJ7sjg==","X-Google-Smtp-Source":"ABdhPJxrDNAWUcn64vJ6VTSghGZBKtg8N/40ucPIqpLL1Mv8RWryA0LKFBrNX5P2VfeZq1QkomOqzw==","X-Received":"by 2002:a2e:743:: with SMTP id i3mr3866660ljd.113.1599735086511; \n\tThu, 10 Sep 2020 03:51:26 -0700 (PDT)","Date":"Thu, 10 Sep 2020 12:51:25 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"<20200910105125.GH4095624@oden.dyn.berto.se>","References":"<20200908134142.27470-1-jacopo@jmondi.org>\n\t<20200908134142.27470-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200908134142.27470-7-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v3 06/11] android: camera_device: Get\n\trid of stream 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":"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\" "}},{"id":12435,"web_url":"https://patchwork.libcamera.org/comment/12435/","msgid":"","date":"2020-09-11T02:28:23","subject":"Re: [libcamera-devel] [PATCH v3 06/11] android: camera_device: Get\n\trid of stream counter","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Thanks for the patch\n\nOn Thu, Sep 10, 2020 at 7:51 PM Niklas Söderlund\n wrote:\n>\n> Hi Jacopo,\n>\n> Thanks for your work.\n>\n> On 2020-09-08 15:41:37 +0200, Jacopo Mondi wrote:\n> > Use the size() method of the CameraConfiguration class to retrieve the\n> > index of the StreamConfiguration associated with a CameraStream and get\n> > rid of the custom counter.\n> >\n> > Acked-by: Laurent Pinchart \n> > Reviewed-by: Kieran Bingham \n> > Signed-off-by: Jacopo Mondi \n>\n> Reviewed-by: Niklas Söderlund \n>\n\nReviewed-by: Hirokazu Honda \n> > ---\n> > src/android/camera_device.cpp | 11 ++---------\n> > 1 file changed, 2 insertions(+), 9 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 5f4b95987615..562cbb3c415e 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -1189,12 +1189,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> > streams_.clear();\n> > streams_.reserve(stream_list->num_streams);\n> >\n> > - /*\n> > - * Track actually created streams, as there may not be a 1:1 mapping of\n> > - * camera3 streams to libcamera streams.\n> > - */\n> > - unsigned int streamIndex = 0;\n> > -\n> > /* First handle all non-MJPEG streams. */\n> > for (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> > camera3_stream_t *stream = stream_list->streams[i];\n> > @@ -1225,8 +1219,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> > streamConfiguration.pixelFormat = format;\n> >\n> > config_->addConfiguration(streamConfiguration);\n> > -\n> > - streams_[i].index = streamIndex++;\n> > + streams_[i].index = config_->size() - 1;\n> > }\n> >\n> > /* Now handle MJPEG streams, adding a new stream if required. */\n> > @@ -1275,7 +1268,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> > << \" for MJPEG support\";\n> >\n> > config_->addConfiguration(streamConfiguration);\n> > - streams_[i].index = streamIndex++;\n> > + streams_[i].index = config_->size() - 1;\n> > }\n> > }\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\n>\n> --\n> Regards,\n> Niklas Söderlund\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 38A68C3B5B\n\tfor ;\n\tFri, 11 Sep 2020 02:28:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F2B9462C8C;\n\tFri, 11 Sep 2020 04:28:35 +0200 (CEST)","from mail-ed1-x541.google.com (mail-ed1-x541.google.com\n\t[IPv6:2a00:1450:4864:20::541])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 84A596037B\n\tfor ;\n\tFri, 11 Sep 2020 04:28:34 +0200 (CEST)","by mail-ed1-x541.google.com with SMTP id t16so8404566edw.7\n\tfor ;\n\tThu, 10 Sep 2020 19:28:34 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"hMn5ZSz+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc:content-transfer-encoding;\n\tbh=qNu92CcNn5rcqzeWqpRLG4/aHHInxxXOwJmdtO3U45g=;\n\tb=hMn5ZSz+QArfCDTVFJG9n9n6CmUAYQifhYregVovpR6uZmI7RApt+vS5/Ml1cV1eHB\n\tnBgAw6jheFyl4U3yWrLmF9Jvr7xXLIlvO/mo9+mwBrDQyy+WXMmxhCMTdWhEx9ldaOji\n\t6Evwngl9FpSdUZqVpYcZ474CDGEPC/9cIVIrk=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc:content-transfer-encoding;\n\tbh=qNu92CcNn5rcqzeWqpRLG4/aHHInxxXOwJmdtO3U45g=;\n\tb=AVECCosU348lPC6p87jFaHbXLjBzMbWoJXTJ0d+G9shWlv3jzMnNWn8ZIPbzMou+9M\n\tixknXDae7t/oKuauef5MaaO3+DBEKH0p6fl+paCSMYqN3cIT2PO6aa/vtVK8v6XAMY4D\n\tUak4Ow6SdgKLP7p3C0HalOy0uZngoBCWEA8tYSluFQllhVuJpREFMmIap4esOm8SKhSJ\n\t208FH1ATMsDfDwGEgK8cksO7rx/PFmNVaF5MAFTs2Al4adGgE+29rmCIdTZtGVaTOXn3\n\tq2l0VkMbVjfPPehLmcPqxASoeNQjppanjTJSGdoXbG7r40a3rn2Sq8Zz2xbnB1yHTb2S\n\tOLlA==","X-Gm-Message-State":"AOAM5326Xmt/bqBRws6ZdDKLfd5JkQi87eT+2IdAPPYOihz/hVzFmRSQ\n\tfYNfedtvLF+w8K38ccYv4TEOr3W2MekDKaZ413MiDg==","X-Google-Smtp-Source":"ABdhPJxkzbIMAjD3iLLVRNxuwjuuVWzOH79x1172XqM9FNtL1CQbYNSz+RpJNKkBy3p03/frSN71Zpa9agbJ8nthPls=","X-Received":"by 2002:a05:6402:3192:: with SMTP id\n\tdi18mr12611220edb.116.1599791314210; \n\tThu, 10 Sep 2020 19:28:34 -0700 (PDT)","MIME-Version":"1.0","References":"<20200908134142.27470-1-jacopo@jmondi.org>\n\t<20200908134142.27470-7-jacopo@jmondi.org>\n\t<20200910105125.GH4095624@oden.dyn.berto.se>","In-Reply-To":"<20200910105125.GH4095624@oden.dyn.berto.se>","From":"Hirokazu Honda ","Date":"Fri, 11 Sep 2020 11:28:23 +0900","Message-ID":"","To":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","Subject":"Re: [libcamera-devel] [PATCH v3 06/11] android: camera_device: Get\n\trid of stream 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":"Hanlin Chen ,\n\tlibcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]